This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mysql-connector-java.
commit fb4355005581d68aa7f86dcdd0b84df0e515c730 Merge: 637d036 15b0228 Author: Emmanuel Bourg <[email protected]> Date: Wed May 3 00:04:25 2017 +0200 Merge tag 'upstream/5.1.42' Upstream version 5.1.42 CHANGES | 38 +- README | 2 +- README.txt | 2 +- build.xml | 4 +- .../fabric/jdbc/FabricMySQLConnectionProxy.java | 40 +- src/com/mysql/jdbc/CallableStatement.java | 23 +- src/com/mysql/jdbc/CharsetMapping.java | 2 + src/com/mysql/jdbc/ConnectionImpl.java | 82 +- src/com/mysql/jdbc/ConnectionPropertiesImpl.java | 11 + src/com/mysql/jdbc/DatabaseMetaData.java | 6 +- src/com/mysql/jdbc/ExportControlled.java | 161 +++- src/com/mysql/jdbc/JDBC42ResultSet.java | 19 +- src/com/mysql/jdbc/JDBC42UpdatableResultSet.java | 64 +- src/com/mysql/jdbc/JDBC4UpdatableResultSet.java | 96 +- .../mysql/jdbc/LocalizedErrorMessages.properties | 8 +- src/com/mysql/jdbc/MultiHostMySQLConnection.java | 4 +- src/com/mysql/jdbc/MySQLConnection.java | 4 +- src/com/mysql/jdbc/ReplicationMySQLConnection.java | 4 +- src/com/mysql/jdbc/ResultSetImpl.java | 130 ++- src/com/mysql/jdbc/StatementImpl.java | 68 +- src/com/mysql/jdbc/StringUtils.java | 298 +++--- src/com/mysql/jdbc/UpdatableResultSet.java | 1006 ++++++++++---------- .../CallableStatementRegressionTest.java | 141 ++- .../regression/ConnectionRegressionTest.java | 65 +- .../regression/MetaDataRegressionTest.java | 80 +- .../regression/ResultSetRegressionTest.java | 113 ++- .../regression/StatementRegressionTest.java | 156 ++- .../regression/jdbc4/ConnectionRegressionTest.java | 4 +- .../regression/jdbc4/MetaDataRegressionTest.java | 141 ++- .../regression/jdbc42/ResultSetRegressionTest.java | 75 ++ src/testsuite/simple/ConnectionTest.java | 181 +++- src/testsuite/simple/ResultSetTest.java | 6 +- src/testsuite/simple/StringUtilsTest.java | 351 ++++++- src/testsuite/ssl-test-certs/ca-cert.pem | 44 +- src/testsuite/ssl-test-certs/ca-key.pem | 50 +- src/testsuite/ssl-test-certs/ca-truststore | Bin 0 -> 1109 bytes src/testsuite/ssl-test-certs/certs_howto.txt | 119 ++- src/testsuite/ssl-test-certs/client-cert.pem | 22 + src/testsuite/ssl-test-certs/client-key.pem | 27 + src/testsuite/ssl-test-certs/client-keystore | Bin 0 -> 2308 bytes src/testsuite/ssl-test-certs/server-cert.pem | 40 +- src/testsuite/ssl-test-certs/server-key.pem | 50 +- src/testsuite/ssl-test-certs/server-req.pem | 19 - src/testsuite/ssl-test-certs/test-cert-store | Bin 1105 -> 0 bytes 44 files changed, 2696 insertions(+), 1060 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mysql-connector-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

