1 files changed, 28 insertions, 2 deletions
diff --git a/mysql-test/main/backup_lock.test b/mysql-test/main/backup_lock.test
index 65c11432bb5..0d4da8cb892 100644
--- a/mysql-test/main/backup_lock.test
+++ b/mysql-test/main/backup_lock.test
@@ -252,15 +252,16 @@ SET GLOBAL lock_wait_timeout=0;
 CREATE TABLE t_permanent_innodb (col1 INT) ENGINE = InnoDB;
 CREATE TABLE t_permanent_myisam (col1 INT) ENGINE = MyISAM;
 CREATE TABLE t_permanent_aria  (col1 INT) ENGINE = Aria transactional=1;
+CREATE TABLE t_permanent_aria2  (col1 INT) ENGINE = Aria transactional=0;
 INSERT INTO t_permanent_innodb SET col1 = 1;
 INSERT INTO t_permanent_myisam SET col1 = 1;
 INSERT INTO t_permanent_aria SET col1 = 1;
+INSERT INTO t_permanent_aria2 SET col1 = 1;
 
 CREATE TABLE t_con1_innodb (col1 INT) ENGINE = InnoDB;
 CREATE TABLE t_con1_myisam (col1 INT) ENGINE = MyISAM;
 
 --connect(con1,localhost,root,,)
-SET AUTOCOMMIT = 0;
 
 --connection default
 BACKUP STAGE START;
@@ -269,10 +270,34 @@ BACKUP STAGE BLOCK_DDL;
 BACKUP STAGE BLOCK_COMMIT;
 
 --connection con1
+SET AUTOCOMMIT = 1;
+
+# These should work as values are not changed
+UPDATE t_permanent_aria SET col1 = 1;
+--error ER_LOCK_WAIT_TIMEOUT
+UPDATE t_permanent_innodb SET col1 = 1;
+
+--error ER_LOCK_WAIT_TIMEOUT
 UPDATE t_permanent_innodb SET col1 = 8;
 --error ER_LOCK_WAIT_TIMEOUT
 UPDATE t_permanent_myisam SET col1 = 8;
+--error ER_LOCK_WAIT_TIMEOUT
 UPDATE t_permanent_aria SET col1 = 8;
+--error ER_LOCK_WAIT_TIMEOUT
+UPDATE t_permanent_aria2 SET col1 = 8;
+
+select * from t_permanent_innodb;
+select * from t_permanent_myisam;
+select * from t_permanent_aria;
+select * from t_permanent_aria2;
+
+SET AUTOCOMMIT = 0;
+UPDATE t_permanent_innodb SET col1 = 9;
+UPDATE t_permanent_aria SET col1 = 9;
+--error ER_LOCK_WAIT_TIMEOUT
+UPDATE t_permanent_myisam SET col1 = 9;
+--error ER_LOCK_WAIT_TIMEOUT
+UPDATE t_permanent_aria2 SET col1 = 9;
 
 --error ER_LOCK_WAIT_TIMEOUT
 DROP TABLE t_con1_innodb;
@@ -286,8 +311,9 @@ BACKUP STAGE END;
 select * from t_permanent_innodb;
 select * from t_permanent_myisam;
 select * from t_permanent_aria;
+select * from t_permanent_aria2;
 
-DROP TABLE t_permanent_myisam, t_permanent_innodb, t_permanent_aria;
+DROP TABLE t_permanent_myisam, t_permanent_innodb, t_permanent_aria, t_permanent_aria2;
 DROP TABLE t_con1_innodb, t_con1_myisam;
 --disconnect con1
 set global lock_wait_timeout=default;