Merge branch '5.2.x'

# Conflicts: # spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
2020-09-25 11:36:18 +02:00
parent 9ad5a8ead0 6e4fcb69f0
commit 6c631e3d5c
17 changed files with 233 additions and 115 deletions
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java
@@ -43,6 +43,7 @@ public final class CallMetaDataProviderFactory {
 			"Apache Derby",
 			"DB2",
 			"Informix Dynamic Server",
+			"MariaDB",
 			"Microsoft SQL Server",
 			"MySQL",
 			"Oracle",