upgrade

connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala

@@ -367,8 +367,8 @@ class MySQLOverMariaConnectorIntegrationSuite extends MySQLIntegrationSuite {
 
   override val db = new MySQLDatabaseOnDocker {
     override def getJdbcUrl(ip: String, port: Int): String =
-      s"jdbc:mysql://$ip:$port/mysql?user=root&password=rootpass&allowPublicKeyRetrieval=true" +
-        s"&useSSL=false"
+      s"jdbc:mariadb://$ip:$port/mysql?user=root&password=rootpass&allowPublicKeyRetrieval=true" +
+        s"&sslMode=disable"
   }
 
   override def testConnection(): Unit = {

connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala

@@ -177,7 +177,7 @@ class MySQLOverMariaConnectorIntegrationSuite extends MySQLIntegrationSuite {
 
   override val db = new MySQLDatabaseOnDocker {
     override def getJdbcUrl(ip: String, port: Int): String =
-      s"jdbc:mysql://$ip:$port/mysql?user=root&password=rootpass&allowPublicKeyRetrieval=true" +
-        s"&useSSL=false"
+      s"jdbc:mariadb://$ip:$port/mysql?user=root&password=rootpass&allowPublicKeyRetrieval=true" +
+        s"&sslMode=disable"
   }
 }

docs/sql-migration-guide.md

@@ -60,6 +60,7 @@ license: |
 - Since Spark 4.0, By default views tolerate column type changes in the query and compensate with casts. To restore the previous behavior, allowing up-casts only, set `spark.sql.legacy.viewSchemaCompensation` to `false`.
 - Since Spark 4.0, Views allow control over how they react to underlying query changes. By default views tolerate column type changes in the query and compensate with casts. To disable thsi feature set `spark.sql.legacy.viewSchemaBindingMode` to `false`. This also removes the clause from `DESCRIBE EXTENDED` and `SHOW CREATE TABLE`.
 - Since Spark 4.0, The Storage-Partitioned Join feature flag `spark.sql.sources.v2.bucketing.pushPartValues.enabled` is set to `true`. To restore the previous behavior, set `spark.sql.sources.v2.bucketing.pushPartValues.enabled` to `false`.
+- Since Spark 4.0, The Connector of MariaDB JDBC datasource has been upgraded to the `3.4` series. One of the most typical changes is that the connection strings only accept `jdbc:mariadb` protocol. If you want to continue to use `jdbc:mysql` protocol, you need to set the `permitMysqlScheme` option. For more details, please refer to: [Upgrade from MariaDB Connector/J 2.7 to 3.4](https://mariadb.com/docs/server/connect/programming-languages/java/upgrade/).
 
 ## Upgrading from Spark SQL 3.5.1 to 3.5.2
 

pom.xml

@@ -322,7 +322,7 @@
       -Djdk.reflect.useDirectMethodHandle=false
       -Dio.netty.tryReflectionSetAccessible=true
     </extraJavaTestArgs>
-    <mariadb.java.client.version>2.7.12</mariadb.java.client.version>
+    <mariadb.java.client.version>3.4.0</mariadb.java.client.version>
     <mysql.connector.version>8.4.0</mysql.connector.version>
     <postgresql.version>42.7.3</postgresql.version>
     <db2.jcc.version>11.5.9.0</db2.jcc.version>

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/jdbc/connection/MariaDBConnectionProviderSuite.scala

@@ -22,6 +22,6 @@ class MariaDBConnectionProviderSuite extends ConnectionProviderSuiteBase {
     val provider = new MariaDBConnectionProvider()
     val driver = registerDriver(provider.driverClass)
 
-    testSecureConnectionProvider(provider, driver, options("jdbc:mysql://localhost/mysql"))
+    testSecureConnectionProvider(provider, driver, options("jdbc:mariadb://localhost/mysql"))
   }
 }