Merge branch 'maintenance/2.x' into develop

# Conflicts: # .travis.yml # CHANGELOG.md # README.md # appveyor.yml # pom.xml # src/main/java/org/mariadb/jdbc/CallableFunctionStatement.java # src/main/java/org/mariadb/jdbc/CallableParameterMetaData.java # src/main/java/org/mariadb/jdbc/CallableProcedureStatement.java # src/main/java/org/mariadb/jdbc/ClientSidePreparedStatement.java # src/main/java/org/mariadb/jdbc/DatabaseMetaData.java # src/main/java/org/mariadb/jdbc/MariaDbConnection.java # src/main/java/org/mariadb/jdbc/MariaDbFunctionStatement.java # src/main/java/org/mariadb/jdbc/MariaDbPooledConnection.java # src/main/java/org/mariadb/jdbc/MariaDbProcedureStatement.java # src/main/java/org/mariadb/jdbc/MariaDbStatement.java # src/main/java/org/mariadb/jdbc/internal/com/read/resultset/SelectResultSet.java # src/main/java/org/mariadb/jdbc/internal/com/read/resultset/UpdatableResultSet.java # src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/BinaryRowProtocol.java # src/main/java/org/mariadb/jdbc/internal/com/send/authentication/SendPamAuthPacket.java # src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java # src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java # src/main/java/org/mariadb/jdbc/internal/protocol/tls/MariaDbX509TrustManager.java # src/main/java/org/mariadb/jdbc/internal/util/Utils.java # src/main/java/org/mariadb/jdbc/internal/util/exceptions/ExceptionFactory.java # src/main/java/org/mariadb/jdbc/internal/util/pool/Pool.java # src/main/java/org/mariadb/jdbc/util/DefaultOptions.java # src/test/java/org/mariadb/jdbc/AllowMultiQueriesTest.java # src/test/java/org/mariadb/jdbc/AutoReconnectTest.java # src/test/java/org/mariadb/jdbc/BaseTest.java # src/test/java/org/mariadb/jdbc/BasicBatchTest.java # src/test/java/org/mariadb/jdbc/BigQueryTest.java # src/test/java/org/mariadb/jdbc/BlobTest.java # src/test/java/org/mariadb/jdbc/BooleanTest.java # src/test/java/org/mariadb/jdbc/BufferTest.java # src/test/java/org/mariadb/jdbc/ByteTest.java # src/test/java/org/mariadb/jdbc/CallStatementTest.java # src/test/java/org/mariadb/jdbc/CancelTest.java # src/test/java/org/mariadb/jdbc/CheckDataTest.java # src/test/java/org/mariadb/jdbc/CollationTest.java # src/test/java/org/mariadb/jdbc/ComMultiPrepareStatementTest.java # src/test/java/org/mariadb/jdbc/ConnectionTest.java # src/test/java/org/mariadb/jdbc/CredentialPluginTest.java # src/test/java/org/mariadb/jdbc/DataNTypeTest.java # src/test/java/org/mariadb/jdbc/DataSourcePoolTest.java # src/test/java/org/mariadb/jdbc/DataSourceTest.java # src/test/java/org/mariadb/jdbc/DataTypeSignedTest.java # src/test/java/org/mariadb/jdbc/DataTypeUnsignedTest.java # src/test/java/org/mariadb/jdbc/DatatypeCompatibilityTest.java # src/test/java/org/mariadb/jdbc/DatatypeTest.java # src/test/java/org/mariadb/jdbc/DateTest.java # src/test/java/org/mariadb/jdbc/DistributedTransactionTest.java # src/test/java/org/mariadb/jdbc/DriverTest.java # src/test/java/org/mariadb/jdbc/ErrorMessageTest.java # src/test/java/org/mariadb/jdbc/ExecuteBatchTest.java # src/test/java/org/mariadb/jdbc/FetchSizeTest.java # src/test/java/org/mariadb/jdbc/GeneratedKeysTest.java # src/test/java/org/mariadb/jdbc/GeneratedTest.java # src/test/java/org/mariadb/jdbc/GeometryTest.java # src/test/java/org/mariadb/jdbc/GiganticLoadDataInfileTest.java # src/test/java/org/mariadb/jdbc/JdbcParserTest.java # src/test/java/org/mariadb/jdbc/LocalInfileDisableTest.java # src/test/java/org/mariadb/jdbc/LocalInfileInputStreamTest.java # src/test/java/org/mariadb/jdbc/MariaDbCompatibilityTest.java # src/test/java/org/mariadb/jdbc/MariaDbDatabaseMetaDataTest.java # src/test/java/org/mariadb/jdbc/MultiTest.java # src/test/java/org/mariadb/jdbc/ParserTest.java # src/test/java/org/mariadb/jdbc/PasswordEncodingTest.java # src/test/java/org/mariadb/jdbc/PooledConnectionTest.java # src/test/java/org/mariadb/jdbc/PreparedStatementTest.java # src/test/java/org/mariadb/jdbc/RePrepareTest.java # src/test/java/org/mariadb/jdbc/ReconnectionStateMaxAllowedStatement.java # src/test/java/org/mariadb/jdbc/ResultSetMetaDataTest.java # src/test/java/org/mariadb/jdbc/ResultSetTest.java # src/test/java/org/mariadb/jdbc/ScalarFunctionsTest.java # src/test/java/org/mariadb/jdbc/ScrollTypeTest.java # src/test/java/org/mariadb/jdbc/ServerPrepareStatementTest.java # src/test/java/org/mariadb/jdbc/SslTest.java # src/test/java/org/mariadb/jdbc/StateChangeTest.java # src/test/java/org/mariadb/jdbc/StatementTest.java # src/test/java/org/mariadb/jdbc/StoredProcedureTest.java # src/test/java/org/mariadb/jdbc/StringUTFTest.java # src/test/java/org/mariadb/jdbc/TimeoutTest.java # src/test/java/org/mariadb/jdbc/TimezoneDaylightSavingTimeTest.java # src/test/java/org/mariadb/jdbc/TransactionTest.java # src/test/java/org/mariadb/jdbc/TruncateExceptionTest.java # src/test/java/org/mariadb/jdbc/UnicodeTest.java # src/test/java/org/mariadb/jdbc/UpdateResultSetMethodsTest.java # src/test/java/org/mariadb/jdbc/UpdateResultSetTest.java # src/test/java/org/mariadb/jdbc/failover/AllowMasterDownTest.java # src/test/java/org/mariadb/jdbc/failover/BaseMultiHostTest.java # src/test/java/org/mariadb/jdbc/failover/MonoServerFailoverTest.java # src/test/java/org/mariadb/jdbc/integration/DatabaseMetadataTest.java # src/test/java/org/mariadb/jdbc/integration/PoolDataSourceTest.java # src/test/java/org/mariadb/jdbc/internal/util/UtilsTest.java # src/test/resources/timezoneTest.sql
mariadb-corporation · Jul 29, 2021 · f8fcce7 · f8fcce7
2 parents 4db695e + 0b78458
commit f8fcce7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## [2.7.4](https://github.com/mariadb-corporation/mariadb-connector-j/tree/2.7.4) (29 Jul 2021)
+[Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.7.3...2.7.4)
+
+* CONJ-890	getImportedKeys/getTables regression returning an empty resultset for null/empty catalog
+* CONJ-863	Ensure socket state when SocketTimeout occurs
+* CONJ-873	IndexOutOfBoundsException when executing prepared queries using automatic key generation in parallel
+* CONJ-884	MariaDbPoolDataSource leaks connections when the mariadb server restarts
+* CONJ-893	DatabaseMetaData.getColumns regression causing TINYINT(x) with x > 1 to return BIT type in place of TINYINT
+* CONJ-889	CallableStatement using function throw wrong error on getter
+
+
 ## [3.0.0](https://github.com/mariadb-corporation/mariadb-connector-j/tree/3.0.0) (3 May 2021)
 [Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.7.2...3.0.0)
 
@@ -53,8 +64,21 @@ COMMIT;
 Equivalent options are `tcpKeepIdle`, `tcpKeepCount`, `tcpKeepInterval`
 Since available only with java 11, setting this option with java < 11 will have no effect. 
 
-
-
+## [2.7.3](https://github.com/mariadb-corporation/mariadb-connector-j/tree/2.7.3) (12 May 2021)
+[Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.7.2...2.7.3)
+
+* CONJ-619	Multiple batch update fails after LOAD DATA LOCAL INFILE
+* CONJ-854	LOAD XML INFILE breaks when using LOCAL
+* CONJ-855	throwing more specific exception for updatable result-set that can not be updated by ResultSet
+* CONJ-857	Remove use of mysql.proc table, relying on information_schema.parameters
+* CONJ-864	includeThreadDumpInDeadlockExceptions always includes the thread dump, even when it is not a deadlock exception
+* CONJ-866	long binary parsing improvement
+* CONJ-871	OSGi: Missing Import-Package in Connector/J bundle (javax.sql.rowset.serial)
+* CONJ-878	option serverSslCert file location
+* CONJ-880	metadata query performance correction
+* CONJ-858	Properties.put with object that differ from String supported even if use is not recommended
+* CONJ-861	executeBatch must not clear last parameter value.
+* CONJ-883	using unix socket, hostname is not mandatory anymore
 
 
 ## [2.7.2](https://github.com/mariadb-corporation/mariadb-connector-j/tree/2.7.2) (29 Jan. 2021)

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ or maven :
 <dependency>
 	<groupId>org.mariadb.jdbc</groupId>
 	<artifactId>mariadb-java-client</artifactId>
-	<version>2.7.2</version>
+	<version>2.7.4</version>
 </dependency>
 ```
 
@@ -41,7 +41,6 @@ But still in alpha for now:
 </dependency>
 ```
 
-
 ## Documentation
 
 For a Getting started guide, API docs, recipes,  etc. see the 

diff --git a/appveyor.yml b/appveyor.yml
@@ -23,20 +23,12 @@ environment:
 
 clone_folder: c:\projects\mariadb-connector-j
 install:
-  - ps: |
-      Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\maven" )) {
-        (new-object System.Net.WebClient).DownloadFile('https://www.us.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip', 'C:\maven-bin.zip')
-        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
-      }
-  # Prepend Java entry, remove Ruby entry (C:\Ruby193\bin;) from PATH
+  - cmd: choco install maven
   - cmd: appveyor-download.bat
   - cmd: msiexec /i server.msi INSTALLDIR=c:\projects\server SERVICENAME=mariadb ALLOWREMOTEROOTACCESS=true /qn
   - cmd: "\"c:\\projects\\server\\bin\\mysql.exe\" -e \"create database testj\" --user=root"
-  - cmd: SET PATH=C:\maven\apache-maven-3.6.3\bin;%JAVA_HOME%\bin;%PATH:C:\Ruby193\bin;=%;
   - cmd: SET MAVEN_OPTS=-Xms512m -Xms768m
   - cmd: SET JAVA_OPTS=-Xms512m -Xmx768m
-  - cmd: SET M2_HOME=C:\maven\apache-maven-3.5.4
   - cmd: cd c:\projects\mariadb-connector-j
   - cmd: mvn --version
   - cmd: java -version