[misc] test correction

Author: diego Dupin

.travis.yml

@@ -38,7 +38,7 @@ jobs:
  allow_failures:
  - env: srv=build v=10.6
  include:
- - env: srv=mariadb v=10.5
+ - env: srv=mariadb v=10.6
  os: windows
  language: shell
  - env: srv=mariadb v=10.2 local=1

src/main/java/org/mariadb/jdbc/client/impl/StandardClient.java

@@ -295,7 +295,9 @@ private void postConnectionQueries() throws SQLException {
  commands.add("show status like 'wsrep_local_state'");
  }
 
- if (!hostAddress.primary && context.getVersion().versionGreaterOrEqual(5, 6, 5)) {
+ if (hostAddress != null
+ && !hostAddress.primary
+ && context.getVersion().versionGreaterOrEqual(5, 6, 5)) {
  commands.add("SET SESSION TRANSACTION READ ONLY");
  }
 

src/test/java/org/mariadb/jdbc/integration/ConnectionTest.java

@@ -932,20 +932,20 @@ public void localSocket() throws Exception {
  && !System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("win"));
  Statement stmt = sharedConn.createStatement();
  ResultSet rs = stmt.executeQuery("select @@version_compile_os,@@socket");
- if (!rs.next()) {
+ if (!rs.next() || rs.getString(2) == null) {
  return;
  }
  String path = rs.getString(2);
- stmt.execute("DROP USER IF EXISTS testSocket@'localhost'");
- stmt.execute("CREATE USER testSocket@'localhost' IDENTIFIED BY 'MySup5%rPassw@ord'");
- stmt.execute("GRANT SELECT on *.* to testSocket@'localhost' IDENTIFIED BY 'MySup5%rPassw@ord'");
+ stmt.execute("DROP USER IF EXISTS testSocket");
+ stmt.execute("CREATE USER testSocket IDENTIFIED BY 'heyPassw!µ20§rd'");
+ stmt.execute("GRANT SELECT on *.* to testSocket IDENTIFIED BY 'heyPassw!µ20§rd'");
  stmt.execute("FLUSH PRIVILEGES");
 
- try (java.sql.Connection connection =
- DriverManager.getConnection(
- String.format(
-  "jdbc:mariadb:///%s?user=testSocket&password=%s&localSocket=%s&tcpAbortiveClose&tcpKeepAlive",
-  sharedConn.getCatalog(), "MySup5%rPassw@ord", path))) {
+ String url = String.format(
+  "jdbc:mariadb:///%s?user=testSocket&password=heyPassw!µ20§rd&localSocket=%s&tcpAbortiveClose&tcpKeepAlive",
+ sharedConn.getCatalog(), path);
+ System.out.println(url);
+ try (java.sql.Connection connection = DriverManager.getConnection(url)) {
  connection.setNetworkTimeout(null, 300);
  rs = connection.createStatement().executeQuery("select 1");
  assertTrue(rs.next());
@@ -957,7 +957,7 @@ public void localSocket() throws Exception {
  DriverManager.getConnection(
  "jdbc:mariadb:///"
  + sharedConn.getCatalog()
- + "?user=testSocket&password=MySup5%rPassw@ord&localSocket=/wrongPath"),
+ + "?user=testSocket&password=heyPassw!µ20§rd&localSocket=/wrongPath"),
  "Socket fail to connect to host");
 
  if (haveSsl()) {
@@ -967,7 +967,7 @@ public void localSocket() throws Exception {
  DriverManager.getConnection(
  "jdbc:mariadb:///"
  + sharedConn.getCatalog()
- + "?sslMode=verify-full&user=testSocket&password=MySup5%rPassw@ord"
+ + "?sslMode=verify-full&user=testSocket&password=heyPassw!µ20§rd"
  + "&serverSslCert="
  + serverCertPath
  + "&localSocket="
@@ -977,7 +977,7 @@ public void localSocket() throws Exception {
  }
  }
  }
- stmt.execute("DROP USER testSocket@'localhost'");
+ stmt.execute("DROP USER testSocket");
  }
 
  @Test