Merge branch '1.5.x'

2018-02-10 15:06:16 +01:00
parent 63c827b14d da01744e4c
commit 5e0df39c66
1 changed files with 1 additions and 1 deletions
--- 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.