[CONJ-914] remove enabling session_track_schema on connection creation

mariadb-corporation · Jan 10, 2022 · 8fd7c00 · 8fd7c00
1 parent a7d7782
commit 8fd7c00
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java
@@ -964,9 +964,6 @@ private void sendSessionInfos() throws IOException {
     StringBuilder sessionOption =
         new StringBuilder("autocommit=").append(options.autocommit ? "1" : "0");
     if ((serverCapabilities & MariaDbServerCapabilities.CLIENT_SESSION_TRACK) != 0) {
-      if (options.trackSchema) {
-        sessionOption.append(", session_track_schema=1");
-      }
       if (options.rewriteBatchedStatements) {
         sessionOption.append(", session_track_system_variables='auto_increment_increment' ");
       }

diff --git a/src/test/java/org/mariadb/jdbc/ScalarFunctionsTest.java b/src/test/java/org/mariadb/jdbc/ScalarFunctionsTest.java
@@ -171,8 +171,11 @@ public void scalarFctTest() throws SQLException {
     queryScalar("SELECT {fn convert(?, SQL_BIGINT)}", 2147483648L, 2147483648L);
     queryScalar("SELECT {fn convert(?, SQL_BIGINT)}", BigInteger.valueOf(2147483648L), 2147483648L);
     queryScalar("SELECT {fn convert(?, SQL_BIGINT)}", 20, new Object[] {20, 20L});
-    if (!isMariadbServer() && minVersion(8,0,27)) {
-      queryScalar("SELECT {fn convert(?, SQL_BOOLEAN)}", true, new Object[] {BigInteger.ONE, BigInteger.ONE});
+    if (!isMariadbServer() && minVersion(8, 0, 27)) {
+      queryScalar(
+          "SELECT {fn convert(?, SQL_BOOLEAN)}",
+          true,
+          new Object[] {BigInteger.ONE, BigInteger.ONE});
     } else {
       queryScalar("SELECT {fn convert(?, SQL_BOOLEAN)}", true, new Object[] {1, 1L});
     }

diff --git a/src/test/java/org/mariadb/jdbc/failover/SequentialFailoverTest.java b/src/test/java/org/mariadb/jdbc/failover/SequentialFailoverTest.java
@@ -94,9 +94,9 @@ public void init() {
   @Test
   public void connectionSequenceAndBack() throws Throwable {
     Assume.assumeTrue(
-            !"maxscale".equals(System.getenv("srv"))
-                    && !"skysql".equals(System.getenv("srv"))
-                    && !"skysql-ha".equals(System.getenv("srv")));
+        !"maxscale".equals(System.getenv("srv"))
+            && !"skysql".equals(System.getenv("srv"))
+            && !"skysql-ha".equals(System.getenv("srv")));
     TcpProxy proxy1 = new TcpProxy(hostname, port);
     TcpProxy proxy2 = new TcpProxy(hostname, port);
     String connString =