[CONJ-368] metadata info correction after ResultSet reimplementation

mariadb-corporation · Apr 3, 2017 · a17579c · a17579c
1 parent b09a708
commit a17579c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/failover/impl/MastersSlavesListener.java b/src/main/java/org/mariadb/jdbc/internal/failover/impl/MastersSlavesListener.java
@@ -680,6 +680,8 @@ public HandleErrorResult secondaryFail(Method method, Object[] args) throws Thro
                         proxy.lock.unlock();
                     }
                     FailoverLoop.addListener(this);
+                    logger.info("Connection to slave lost, using master connection"
+                            + ", query is re-execute on master server without throwing exception");
                     return relaunchOperation(method, args); //now that we are on master, relaunched result if the result was not crashing the master
                 }
             } catch (Exception e) {

diff --git a/src/main/java/org/mariadb/jdbc/internal/io/input/StandardPacketInputStream.java b/src/main/java/org/mariadb/jdbc/internal/io/input/StandardPacketInputStream.java
@@ -283,8 +283,6 @@ public static byte[] create(byte[][] rowData, ColumnType[] columnTypes) {
         for (int i = 0; i < rowData.length; i++) {
             if (rowData[i] == null) {
                 totalLength++;
-            } else if (columnTypes[i] == ColumnType.BIT) {
-                totalLength++;
             } else {
                 int length = rowData[i].length;
                 if (length < 251) {
@@ -304,8 +302,6 @@ public static byte[] create(byte[][] rowData, ColumnType[] columnTypes) {
         for (int i = 0; i < rowData.length; i++) {
             if (rowData[i] == null) {
                 buf[pos++] = (byte) 251;
-            } else if (columnTypes[i] == ColumnType.BIT) {
-                buf[pos++] = (byte) (rowData[i].equals("0") ? 0 : 1);
             } else {
                 byte[] arr = rowData[i];
                 int length = arr.length;

diff --git a/src/main/java/org/mariadb/jdbc/internal/util/DefaultOptions.java b/src/main/java/org/mariadb/jdbc/internal/util/DefaultOptions.java
@@ -247,7 +247,7 @@ public enum DefaultOptions {
      * When in multiple hosts, after this time in second without used, verification that the connections haven't been lost.
      * When 0, no verification will be done. Defaults to 0 (120 before 1.5.8 version)
      */
-    VALID_CONNECTION_TIMEOUT("validConnectionTimeout", 120, 0, Integer.MAX_VALUE, "1.2.0"),
+    VALID_CONNECTION_TIMEOUT("validConnectionTimeout", 0, 0, Integer.MAX_VALUE, "1.2.0"),
 
     /**
      * time in second a server is blacklisted after a connection failure.  default to 50s