Merge branch '5.1.x'

spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -418,6 +418,9 @@ public abstract class JdbcUtils {
 		if (source != null && source.startsWith("DB2")) {
 			name = "DB2";
 		}
+		else if ("MariaDB".equals(source)) {
+			name = "MySQL";
+		}
 		else if ("Sybase SQL Server".equals(source) ||
 				"Adaptive Server Enterprise".equals(source) ||
 				"ASE".equals(source) ||

spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml

@@ -186,6 +186,12 @@
 	</bean>
 
 	<bean id="MySQL" class="org.springframework.jdbc.support.SQLErrorCodes">
+		<property name="databaseProductNames">
+			<list>
+				<value>MySQL</value>
+				<value>MariaDB</value>
+			</list>
+		</property>
 		<property name="badSqlGrammarCodes">
 			<value>1054,1064,1146</value>
 		</property>