throw QueryTimeoutException and LockTimeoutException on MySQL and Maria

Author: gavinking

hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java

@@ -10,6 +10,7 @@
 import java.util.Set;
 
 import org.hibernate.PessimisticLockException;
+import org.hibernate.QueryTimeoutException;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.dialect.aggregate.AggregateSupport;
@@ -352,17 +353,19 @@ public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
 	public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 		return (sqlException, message, sql) -> {
 			switch ( sqlException.getErrorCode() ) {
-				// If @@innodb_snapshot_isolation is set (default since 11.6.2),
-				// if an attempt to acquire a lock on a record that does not exist in the current read view is made,
-				// an error DB_RECORD_CHANGED will be raised.
-				case 1020:
-					return new LockAcquisitionException( message, sqlException, sql );
 				case 1205:
+					return new LockTimeoutException( message, sqlException, sql );
 				case 3572:
 					return new PessimisticLockException( message, sqlException, sql );
+				case 1020:
+					// If @@innodb_snapshot_isolation is set (default since 11.6.2),
+					// and an attempt to acquire a lock on a record that does not exist
+					// in the current read view is made, error DB_RECORD_CHANGED is raised.
 				case 1207:
 				case 1206:
 					return new LockAcquisitionException( message, sqlException, sql );
+				case 3024:
+					return new QueryTimeoutException( message, sqlException, sql );
 				case 1062:
 					// Unique constraint violation
 					return new ConstraintViolationException( message, sqlException, sql, ConstraintKind.UNIQUE,

hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java

@@ -18,6 +18,7 @@
 import org.hibernate.Length;
 import org.hibernate.LockOptions;
 import org.hibernate.PessimisticLockException;
+import org.hibernate.QueryTimeoutException;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.cfg.AvailableSettings;
@@ -1244,11 +1245,14 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 		return (sqlException, message, sql) -> {
 			switch ( sqlException.getErrorCode() ) {
 				case 1205:
+					return new LockTimeoutException( message, sqlException, sql );
 				case 3572:
 					return new PessimisticLockException( message, sqlException, sql );
 				case 1207:
 				case 1206:
 					return new LockAcquisitionException( message, sqlException, sql );
+				case 3024:
+					return new QueryTimeoutException( message, sqlException, sql );
 				case 1062:
 					// Unique constraint violation
 					return new ConstraintViolationException( message, sqlException, sql, ConstraintKind.UNIQUE,