[TRAVIS] Add MySQL PGP key for validation against MySQL database - se…

…cond part
mariadb-corporation · Jul 23, 2015 · af1b810 · af1b810
1 parent 54e624d
commit af1b810
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.travis/before_test.sh b/.travis/before_test.sh
@@ -3,6 +3,8 @@
 set -x
 set -e
 
+export MYSQ_GPG_KEY=5072E1F5
+
 remove_mysql(){
     sudo service mysql stop
     sudo apt-get remove --purge mysql-server mysql-client mysql-common
@@ -21,7 +23,9 @@ then
 deb http://repo.mysql.com/apt/ubuntu/ precise mysql-$MYSQL_VERSION
 deb-src http://repo.mysql.com/apt/ubuntu/ precise mysql-$MYSQL_VERSION
 END
-    sudo gpg --recv-keys 5072E1F5
+
+    sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys $MYSQ_GPG_KEY
+
     sudo apt-get update
     sudo apt-get install mysql-server
 

diff --git a/src/test/java/org/mariadb/jdbc/MultiTest.java b/src/test/java/org/mariadb/jdbc/MultiTest.java
@@ -239,7 +239,10 @@ private int retrieveSessionVariableFromServer(Connection tmpConnection, String v
     }
 
 
-
+    /**
+     * CONJ-141 : Batch Statement Rewrite: Support for ON DUPLICATE KEY
+     * @throws SQLException
+     */
     @Test
     public void rewriteBatchedStatementsWithQueryFirstAndLAst() throws SQLException {
         Properties props = new Properties();
@@ -268,6 +271,7 @@ public void rewriteBatchedStatementsWithQueryFirstAndLAst() throws SQLException
             if (tmpConnection != null) tmpConnection.close();
         }
     }
+
     /**
      * CONJ-142: Using a semicolon in a string with "rewriteBatchedStatements=true" fails
      *