Merge branch '1.5.x'

5e0df39c · Stephane Nicoll · 63c827b1 · da01744e · 5e0df39c
Commit 5e0df39c authored Feb 10, 2018 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

DatabaseDriver.java ...in/java/org/springframework/boot/jdbc/DatabaseDriver.java +1 -1

No files found.
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
@@ -67,7 +67,7 @@ public enum DatabaseDriver {
 	 * MySQL.
 	 */
 	MYSQL("MySQL", "com.mysql.jdbc.Driver",
-			"com.mysql.jdbc.jdbc2.optional.MysqlXADataSource", "SELECT 1"),
+			"com.mysql.jdbc.jdbc2.optional.MysqlXADataSource", "/* ping */ SELECT 1"),
 	/**
 	 * Maria DB.