version 1.4.6

mariadb-corporation · Jun 13, 2016 · 67aaeb1 · 67aaeb1
1 parent 90ddd2a
commit 67aaeb1
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 25 deletions.
diff --git a/documentation/Changelog.md b/documentation/Changelog.md
@@ -1,4 +1,5 @@
 # Changelog
+* [1.4.6](#1.4.6) Released on 13 june 2016 
 * [1.4.5](#1.4.5) Released on 18 mai 2016 
 * [1.4.4](#1.4.4) Released on 04 mai 2016 
 * [1.4.3](#1.4.3) Released on 22 april 2016 
@@ -7,6 +8,13 @@
 * [1.4.0](#1.4.0) Released on 31 march 2016
 
 ---
+
+## 1.4.6
+* [CONJ-293] Permit named pipe connection without host
+* [CONJ-309] Possible NPE on aurora when failover occur during connection initialisation
+* [CONJ-312] NPE while loading a null from TIMESTAMP field using binary protocol
+* [misc] batch with one parameter correction (using rewriteBatchedStatements option)
+
 ## 1.4.5
 * [CONJ-297] Useless memory consumption when using Statement.setQueryTimeout
 * [CONJ-294] PrepareStatement on master reconnection after a failover

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>mariadb-java-client</artifactId>
     <packaging>jar</packaging>
     <name>mariadb-java-client</name>
-    <version>1.4.6-SNAPSHOT</version>
+    <version>1.4.6</version>
     <description>JDBC driver for MariaDB and MySQL</description>
     <url>https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/</url>
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java b/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
@@ -51,10 +51,10 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 package org.mariadb.jdbc.internal.util.constant;
 
 public final class Version {
-    public static final String version = "1.4.6-SNAPSHOT";
+    public static final String version = "1.4.6";
     public static final int majorVersion = 1;
     public static final int minorVersion = 4;
     public static final int patchVersion = 6;
-    public static final String qualifier = "SNAPSHOT";
+    public static final String qualifier = "";
 
 }
diff --git a/src/test/java/org/mariadb/jdbc/DriverTest.java b/src/test/java/org/mariadb/jdbc/DriverTest.java
@@ -1089,18 +1089,22 @@ public void conj25() throws Exception {
 
     @Test
     public void namedPipe() throws Exception {
-        ResultSet rs = sharedConnection.createStatement().executeQuery("select @@named_pipe,@@socket");
-        rs.next();
-        if (rs.getBoolean(1)) {
-            String namedPipeName = rs.getString(2);
-            //skip test if no namedPipeName was obtained because then we do not use a socket connection
-            Assume.assumeTrue(namedPipeName != null);
-            try (Connection connection = setConnection("&pipe=" + namedPipeName)) {
-                Statement stmt = connection.createStatement();
-                rs = stmt.executeQuery("SELECT 1");
-                assertTrue(rs.next());
-                rs.close();
+        try {
+            ResultSet rs = sharedConnection.createStatement().executeQuery("select @@named_pipe,@@socket");
+            rs.next();
+            if (rs.getBoolean(1)) {
+                String namedPipeName = rs.getString(2);
+                //skip test if no namedPipeName was obtained because then we do not use a socket connection
+                Assume.assumeTrue(namedPipeName != null);
+                try (Connection connection = setConnection("&pipe=" + namedPipeName)) {
+                    Statement stmt = connection.createStatement();
+                    rs = stmt.executeQuery("SELECT 1");
+                    assertTrue(rs.next());
+                    rs.close();
+                }
             }
+        } catch (SQLException e) {
+            //not on windows
         }
     }
 
@@ -1111,18 +1115,23 @@ public void namedPipe() throws Exception {
      */
     @Test
     public void namedPipeWithoutHost() throws Exception {
-        ResultSet rs = sharedConnection.createStatement().executeQuery("select @@named_pipe,@@socket");
-        rs.next();
-        if (rs.getBoolean(1)) {
-            String namedPipeName = rs.getString(2);
-            //skip test if no namedPipeName was obtained because then we do not use a socket connection
-            Assume.assumeTrue(namedPipeName != null);
-            try (Connection connection = DriverManager.getConnection("jdbc:mariadb://localhost/testj?user=" + username + "&pipe=" + namedPipeName)) {
-                Statement stmt = connection.createStatement();
-                rs = stmt.executeQuery("SELECT 1");
-                assertTrue(rs.next());
-                rs.close();
+        try {
+            ResultSet rs = sharedConnection.createStatement().executeQuery("select @@named_pipe,@@socket");
+            rs.next();
+            if (rs.getBoolean(1)) {
+                String namedPipeName = rs.getString(2);
+                //skip test if no namedPipeName was obtained because then we do not use a socket connection
+                Assume.assumeTrue(namedPipeName != null);
+                try (Connection connection = DriverManager.getConnection("jdbc:mariadb://localhost/testj?user="
+                        + username + "&pipe=" + namedPipeName)) {
+                    Statement stmt = connection.createStatement();
+                    rs = stmt.executeQuery("SELECT 1");
+                    assertTrue(rs.next());
+                    rs.close();
+                }
             }
+        } catch (SQLException e) {
+            //not on windows
         }
     }