Merge branch '1.2.x'

2016-01-14 15:57:13 +00:00 · 2016-01-14 15:57:13 +00:00 · 24fd503743
parent 13db85f84b b99739212a
commit 24fd503743
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DatabaseDriver.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DatabaseDriver.java
@ -57,7 +57,7 @@ enum DatabaseDriver {
 	/**
 	 * MySQL.
 	 */
-	MYSQL("com.mysql.jdbc.Driver", "org.mysql.jdbc.MySQLDataSource"),
+	MYSQL("com.mysql.jdbc.Driver", "com.mysql.jdbc.jdbc2.optional.MysqlXADataSource"),

 	/**
 	 * Maria DB.