diff options
Diffstat (limited to 'mysql-test/main/backup_stages.result')
| -rw-r--r-- | mysql-test/main/backup_stages.result | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/main/backup_stages.result b/mysql-test/main/backup_stages.result index 823e5d7e462..045497dcd0b 100644 --- a/mysql-test/main/backup_stages.result +++ b/mysql-test/main/backup_stages.result @@ -221,11 +221,11 @@ SELECT * FROM t_permanent_myisam ORDER BY col1; col1 col2 3 NULL SET AUTOCOMMIT = 0; -SET GLOBAL tx_read_only = 1; +SET GLOBAL transaction_read_only = 1; connection con12; BACKUP STAGE START; BACKUP STAGE END; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 0; DROP VIEW v_some_view; DROP TABLE t_con1_innodb; DROP TABLE t_con1_myisam; @@ -241,8 +241,8 @@ LOCK TABLES t_permanent_myisam READ; LOCK TABLES t_permanent_innodb WRITE; LOCK TABLES t_permanent_myisam WRITE; UNLOCK TABLES; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; connection backup; BACKUP STAGE FLUSH; connection con11; @@ -255,8 +255,8 @@ LOCK TABLES t_permanent_innodb WRITE; LOCK TABLES t_permanent_myisam WRITE; ERROR HY000: Lock wait timeout exceeded; try restarting transaction UNLOCK TABLES; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; connection backup; BACKUP STAGE BLOCK_DDL; connection con11; @@ -270,8 +270,8 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction LOCK TABLES t_permanent_myisam WRITE; ERROR HY000: Lock wait timeout exceeded; try restarting transaction UNLOCK TABLES; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; connection backup; BACKUP STAGE BLOCK_COMMIT; connection con11; @@ -285,8 +285,8 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction LOCK TABLES t_permanent_myisam WRITE; ERROR HY000: Lock wait timeout exceeded; try restarting transaction UNLOCK TABLES; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; connection backup; BACKUP STAGE END; DROP TABLE t_permanent_innodb; |