diff options
Diffstat (limited to 'mysql-test/main')
24 files changed, 116 insertions, 120 deletions
diff --git a/mysql-test/main/backup_interaction.result b/mysql-test/main/backup_interaction.result index a6fe7cf448d..e5ddd140516 100644 --- a/mysql-test/main/backup_interaction.result +++ b/mysql-test/main/backup_interaction.result @@ -320,20 +320,20 @@ col1 HANDLER t1_myisam CLOSE; BACKUP STAGE END; drop table t1_innodb,t1_myisam; -# Show the fate and impact of some SET GLOBAL tx_read_only = 1/0 +# Show the fate and impact of some SET GLOBAL transaction_read_only = 1/0 # sliding through the sequence. BACKUP STAGE START; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; BACKUP STAGE FLUSH; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; BACKUP STAGE BLOCK_DDL; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; BACKUP STAGE BLOCK_COMMIT; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; BACKUP STAGE END; # Show the fate and impact of some SET SESSION sql_log_bin = 0/1 # sliding through the sequence. diff --git a/mysql-test/main/backup_interaction.test b/mysql-test/main/backup_interaction.test index c755bdf8f95..8744ef2c261 100644 --- a/mysql-test/main/backup_interaction.test +++ b/mysql-test/main/backup_interaction.test @@ -300,21 +300,21 @@ HANDLER t1_myisam CLOSE; BACKUP STAGE END; drop table t1_innodb,t1_myisam; ---echo # Show the fate and impact of some SET GLOBAL tx_read_only = 1/0 +--echo # Show the fate and impact of some SET GLOBAL transaction_read_only = 1/0 --echo # sliding through the sequence. BACKUP STAGE START; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; BACKUP STAGE FLUSH; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; BACKUP STAGE BLOCK_DDL; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; BACKUP STAGE BLOCK_COMMIT; -SET GLOBAL tx_read_only = 1; -SET GLOBAL tx_read_only = 0; +SET GLOBAL transaction_read_only = 1; +SET GLOBAL transaction_read_only = 0; BACKUP STAGE END; --echo # Show the fate and impact of some SET SESSION sql_log_bin = 0/1 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; diff --git a/mysql-test/main/backup_stages.test b/mysql-test/main/backup_stages.test index 77d410b6caf..7af65284bf4 100644 --- a/mysql-test/main/backup_stages.test +++ b/mysql-test/main/backup_stages.test @@ -254,11 +254,11 @@ COMMIT; SELECT * FROM t_permanent_innodb ORDER BY col1; SELECT * FROM t_permanent_myisam ORDER BY col1; 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; @@ -276,8 +276,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 @@ -290,8 +290,8 @@ LOCK TABLES t_permanent_innodb WRITE; --error ER_LOCK_WAIT_TIMEOUT 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 BLOCK_DDL; --connection con11 @@ -305,8 +305,8 @@ LOCK TABLES t_permanent_innodb WRITE; --error ER_LOCK_WAIT_TIMEOUT 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 BLOCK_COMMIT; --connection con11 @@ -320,8 +320,8 @@ LOCK TABLES t_permanent_innodb WRITE; --error ER_LOCK_WAIT_TIMEOUT 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 END; diff --git a/mysql-test/main/commit.result b/mysql-test/main/commit.result index 44d46900d38..bf12f3e0ea0 100644 --- a/mysql-test/main/commit.result +++ b/mysql-test/main/commit.result @@ -19,21 +19,21 @@ SET @@autocommit=0; COMMIT; SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; START TRANSACTION; -SELECT @@tx_isolation; -@@tx_isolation +SELECT @@transaction_isolation; +@@transaction_isolation REPEATABLE-READ Should be REPEATABLE READ SELECT * FROM t1; s1 1 2 -SELECT @@tx_isolation; -@@tx_isolation +SELECT @@transaction_isolation; +@@transaction_isolation REPEATABLE-READ Should be REPEATABLE READ INSERT INTO t1 VALUES (-1); -SELECT @@tx_isolation; -@@tx_isolation +SELECT @@transaction_isolation; +@@transaction_isolation REPEATABLE-READ Should be REPEATABLE READ COMMIT; @@ -310,20 +310,20 @@ COMMIT; # # Test 2: Check setting of variable. SET SESSION TRANSACTION READ WRITE; -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 0 SET SESSION TRANSACTION READ ONLY; -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 1 SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ, READ WRITE; -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 0 SET SESSION TRANSACTION READ ONLY, ISOLATION LEVEL REPEATABLE READ; -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 1 START TRANSACTION; # Not allowed inside a transaction @@ -528,16 +528,16 @@ DROP TABLE t1; # Test 7: SET TRANSACTION inside stored routines CREATE PROCEDURE p1() SET SESSION TRANSACTION READ ONLY; CALL p1(); -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 1 SET SESSION TRANSACTION READ WRITE; DROP PROCEDURE p1; CREATE PROCEDURE p1() SET SESSION TRANSACTION READ ONLY, ISOLATION LEVEL SERIALIZABLE; CALL p1(); -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 1 SET SESSION TRANSACTION READ WRITE, ISOLATION LEVEL REPEATABLE READ; DROP PROCEDURE p1; @@ -549,8 +549,8 @@ END| SELECT f1(); f1() 1 -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 1 SET SESSION TRANSACTION READ WRITE; DROP FUNCTION f1; @@ -562,8 +562,8 @@ END| SELECT f1(); f1() 1 -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 1 SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ, READ WRITE; DROP FUNCTION f1; diff --git a/mysql-test/main/commit.test b/mysql-test/main/commit.test index a0d4ddee152..4fb86f5e8bc 100644 --- a/mysql-test/main/commit.test +++ b/mysql-test/main/commit.test @@ -34,23 +34,23 @@ COMMIT; # # Verify consistent output from -# SELECT @@tx_isolation (Bug#20837) +# SELECT @@transaction_isolation (Bug#20837) # # The transaction will be in READ UNCOMMITTED mode, -# but SELECT @@tx_isolation should report the session +# but SELECT @@transaction_isolation should report the session # value, which is REPEATABLE READ # SET @@autocommit=0; COMMIT; SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; START TRANSACTION; -SELECT @@tx_isolation; +SELECT @@transaction_isolation; --echo Should be REPEATABLE READ SELECT * FROM t1; -SELECT @@tx_isolation; +SELECT @@transaction_isolation; --echo Should be REPEATABLE READ INSERT INTO t1 VALUES (-1); -SELECT @@tx_isolation; +SELECT @@transaction_isolation; --echo Should be REPEATABLE READ COMMIT; @@ -370,16 +370,16 @@ COMMIT; --echo # Test 2: Check setting of variable. SET SESSION TRANSACTION READ WRITE; -SELECT @@tx_read_only; +SELECT @@transaction_read_only; SET SESSION TRANSACTION READ ONLY; -SELECT @@tx_read_only; +SELECT @@transaction_read_only; SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ, READ WRITE; -SELECT @@tx_read_only; +SELECT @@transaction_read_only; SET SESSION TRANSACTION READ ONLY, ISOLATION LEVEL REPEATABLE READ; -SELECT @@tx_read_only; +SELECT @@transaction_read_only; START TRANSACTION; --echo # Not allowed inside a transaction @@ -628,14 +628,14 @@ DROP TABLE t1; CREATE PROCEDURE p1() SET SESSION TRANSACTION READ ONLY; CALL p1(); -SELECT @@tx_read_only; +SELECT @@transaction_read_only; SET SESSION TRANSACTION READ WRITE; DROP PROCEDURE p1; CREATE PROCEDURE p1() SET SESSION TRANSACTION READ ONLY, ISOLATION LEVEL SERIALIZABLE; CALL p1(); -SELECT @@tx_read_only; +SELECT @@transaction_read_only; SET SESSION TRANSACTION READ WRITE, ISOLATION LEVEL REPEATABLE READ; DROP PROCEDURE p1; @@ -648,7 +648,7 @@ END| delimiter ;| SELECT f1(); -SELECT @@tx_read_only; +SELECT @@transaction_read_only; SET SESSION TRANSACTION READ WRITE; DROP FUNCTION f1; @@ -661,7 +661,7 @@ END| delimiter ;| SELECT f1(); -SELECT @@tx_read_only; +SELECT @@transaction_read_only; SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ, READ WRITE; DROP FUNCTION f1; diff --git a/mysql-test/main/concurrent_innodb_safelog.result b/mysql-test/main/concurrent_innodb_safelog.result index 40f89c7c65b..182e99256f8 100644 --- a/mysql-test/main/concurrent_innodb_safelog.result +++ b/mysql-test/main/concurrent_innodb_safelog.result @@ -3,8 +3,8 @@ SET GLOBAL innodb_lock_wait_timeout = 1; SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ; connection default; SET SQL_MODE=""; -SELECT @@global.tx_isolation; -@@global.tx_isolation +SELECT @@global.transaction_isolation; +@@global.transaction_isolation REPEATABLE-READ # keep_locks == 1 GRANT ALL ON test.* TO mysqltest@localhost; diff --git a/mysql-test/main/concurrent_innodb_unsafelog.result b/mysql-test/main/concurrent_innodb_unsafelog.result index 3771438bc66..b87a420b6c6 100644 --- a/mysql-test/main/concurrent_innodb_unsafelog.result +++ b/mysql-test/main/concurrent_innodb_unsafelog.result @@ -1,11 +1,11 @@ SET @save_timeout = @@GLOBAL.innodb_lock_wait_timeout; SET GLOBAL innodb_lock_wait_timeout = 1; -SET @save_isolation = @@GLOBAL.tx_isolation; +SET @save_isolation = @@GLOBAL.transaction_isolation; SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED; connection default; SET SQL_MODE=""; -SELECT @@global.tx_isolation; -@@global.tx_isolation +SELECT @@global.transaction_isolation; +@@global.transaction_isolation READ-COMMITTED # keep_locks == 0 GRANT ALL ON test.* TO mysqltest@localhost; @@ -791,4 +791,4 @@ drop table t1; drop user mysqltest@localhost; SET SQL_MODE=default; SET GLOBAL innodb_lock_wait_timeout = @save_timeout; -SET GLOBAL tx_isolation = @save_isolation; +SET GLOBAL transaction_isolation = @save_isolation; diff --git a/mysql-test/main/concurrent_innodb_unsafelog.test b/mysql-test/main/concurrent_innodb_unsafelog.test index d9e5effaaf6..400d7ef8d87 100644 --- a/mysql-test/main/concurrent_innodb_unsafelog.test +++ b/mysql-test/main/concurrent_innodb_unsafelog.test @@ -18,10 +18,10 @@ let $engine_type= InnoDB; SET @save_timeout = @@GLOBAL.innodb_lock_wait_timeout; SET GLOBAL innodb_lock_wait_timeout = 1; -SET @save_isolation = @@GLOBAL.tx_isolation; +SET @save_isolation = @@GLOBAL.transaction_isolation; SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED; --disable_service_connection --source include/concurrent.inc --enable_service_connection SET GLOBAL innodb_lock_wait_timeout = @save_timeout; -SET GLOBAL tx_isolation = @save_isolation; +SET GLOBAL transaction_isolation = @save_isolation; diff --git a/mysql-test/main/innodb_mysql_lock2.result b/mysql-test/main/innodb_mysql_lock2.result index 9dd5bddc085..a03e1d842b2 100644 --- a/mysql-test/main/innodb_mysql_lock2.result +++ b/mysql-test/main/innodb_mysql_lock2.result @@ -12,8 +12,8 @@ # This test makes sense only in REPEATABLE-READ mode as # in SERIALIZABLE mode all statements that read data take # shared lock on them to enforce its semantics. -select @@session.tx_isolation; -@@session.tx_isolation +select @@session.transaction_isolation; +@@session.transaction_isolation REPEATABLE-READ # Prepare playground by creating tables, views, # routines and triggers used in tests. diff --git a/mysql-test/main/innodb_mysql_lock2.test b/mysql-test/main/innodb_mysql_lock2.test index e5bb4bd9565..b35c23ce659 100644 --- a/mysql-test/main/innodb_mysql_lock2.test +++ b/mysql-test/main/innodb_mysql_lock2.test @@ -31,7 +31,7 @@ CALL mtr.add_suppression("Unsafe statement written to the binary log using state --echo # This test makes sense only in REPEATABLE-READ mode as --echo # in SERIALIZABLE mode all statements that read data take --echo # shared lock on them to enforce its semantics. -select @@session.tx_isolation; +select @@session.transaction_isolation; --echo # Prepare playground by creating tables, views, --echo # routines and triggers used in tests. diff --git a/mysql-test/main/mix2_myisam.result b/mysql-test/main/mix2_myisam.result index 842d5bcfb94..1044704c518 100644 --- a/mysql-test/main/mix2_myisam.result +++ b/mysql-test/main/mix2_myisam.result @@ -905,8 +905,8 @@ drop table t1,t2; create table t1 (id int unsigned not null auto_increment, code tinyint unsigned not null, name char(20) not null, primary key (id), key (code), unique (name)) engine=MyISAM; BEGIN; SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE; -SELECT @@tx_isolation,@@global.tx_isolation; -@@tx_isolation @@global.tx_isolation +SELECT @@transaction_isolation,@@global.transaction_isolation; +@@transaction_isolation @@global.transaction_isolation SERIALIZABLE REPEATABLE-READ insert into t1 (code, name) values (1, 'Tim'), (1, 'Monty'), (2, 'David'); select id, code, name from t1 order by id; diff --git a/mysql-test/main/partition_innodb.result b/mysql-test/main/partition_innodb.result index 95ca989eabf..8238650012f 100644 --- a/mysql-test/main/partition_innodb.result +++ b/mysql-test/main/partition_innodb.result @@ -303,12 +303,12 @@ PARTITION p2 VALUES LESS THAN MAXVALUE ); INSERT INTO t1 VALUES (1,1), (2,2), (3,3), (4,4), (5,5), (6,6), (7,7), (8,8), (9,9), (10,10), (11,11); -SET @old_tx_isolation := @@session.tx_isolation; +SET @old_transaction_isolation := @@session.transaction_isolation; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; SET autocommit = 0; UPDATE t1 SET DATA = data*2 WHERE id = 3; UPDATE t1 SET data = data*2 WHERE data = 2; -SET @@session.tx_isolation = @old_tx_isolation; +SET @@session.transaction_isolation = @old_transaction_isolation; DROP TABLE t1; # Bug#37721, test of ORDER BY on PK and WHERE on INDEX CREATE TABLE t1 ( diff --git a/mysql-test/main/partition_innodb.test b/mysql-test/main/partition_innodb.test index 563a750b81b..aaca678750b 100644 --- a/mysql-test/main/partition_innodb.test +++ b/mysql-test/main/partition_innodb.test @@ -321,7 +321,7 @@ PARTITION BY RANGE(id) ( INSERT INTO t1 VALUES (1,1), (2,2), (3,3), (4,4), (5,5), (6,6), (7,7), (8,8), (9,9), (10,10), (11,11); -SET @old_tx_isolation := @@session.tx_isolation; +SET @old_transaction_isolation := @@session.transaction_isolation; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; SET autocommit = 0; @@ -344,7 +344,7 @@ UPDATE t1 SET data = data*2 WHERE data = 2; #--replace_regex /.*---TRANSACTION [0-9]+ [0-9]+, .*, OS thread id [0-9]+// /MariaDB thread id [0-9]+, query id [0-9]+ .*// /.*([0-9]+ lock struct\(s\)), heap size [0-9]+, ([0-9]+ row lock\(s\)).*/\1 \2/ #SHOW ENGINE InnoDB STATUS; -SET @@session.tx_isolation = @old_tx_isolation; +SET @@session.transaction_isolation = @old_transaction_isolation; DROP TABLE t1; diff --git a/mysql-test/main/ps.result b/mysql-test/main/ps.result index d60fa28fc96..cb2e9651c3d 100644 --- a/mysql-test/main/ps.result +++ b/mysql-test/main/ps.result @@ -696,21 +696,21 @@ set @@time_zone:='Japan'; execute stmt; @@time_zone Japan -prepare stmt from "select @@tx_isolation"; +prepare stmt from "select @@transaction_isolation"; execute stmt; -@@tx_isolation +@@transaction_isolation REPEATABLE-READ set transaction isolation level read committed; execute stmt; -@@tx_isolation +@@transaction_isolation REPEATABLE-READ set transaction isolation level serializable; execute stmt; -@@tx_isolation +@@transaction_isolation REPEATABLE-READ -set @@tx_isolation=default; +set @@transaction_isolation=default; execute stmt; -@@tx_isolation +@@transaction_isolation REPEATABLE-READ deallocate prepare stmt; prepare stmt from "create temporary table t1 (letter enum('','a','b','c') diff --git a/mysql-test/main/ps.test b/mysql-test/main/ps.test index bb6ce7d4048..e779eefcb4d 100644 --- a/mysql-test/main/ps.test +++ b/mysql-test/main/ps.test @@ -763,13 +763,13 @@ prepare stmt from "select @@time_zone"; execute stmt; set @@time_zone:='Japan'; execute stmt; -prepare stmt from "select @@tx_isolation"; +prepare stmt from "select @@transaction_isolation"; execute stmt; set transaction isolation level read committed; execute stmt; set transaction isolation level serializable; execute stmt; -set @@tx_isolation=default; +set @@transaction_isolation=default; execute stmt; deallocate prepare stmt; diff --git a/mysql-test/main/set_statement.result b/mysql-test/main/set_statement.result index f0a362e9fe2..a1b1d3659ff 100644 --- a/mysql-test/main/set_statement.result +++ b/mysql-test/main/set_statement.result @@ -1215,8 +1215,6 @@ set @@long_query_time= @save_long_query_time; truncate table mysql.slow_log; set statement autocommit=default for select 1; ERROR 42000: The system variable autocommit cannot be set in SET STATEMENT. -set statement tx_isolation=default for select 1; -ERROR 42000: The system variable tx_isolation cannot be set in SET STATEMENT. set statement skip_replication=default for select 1; ERROR 42000: The system variable skip_replication cannot be set in SET STATEMENT. set statement sql_log_off=default for select 1; diff --git a/mysql-test/main/set_statement.test b/mysql-test/main/set_statement.test index cc191a014a1..029310cdc7c 100644 --- a/mysql-test/main/set_statement.test +++ b/mysql-test/main/set_statement.test @@ -1063,8 +1063,6 @@ truncate table mysql.slow_log; --error ER_SET_STATEMENT_NOT_SUPPORTED set statement autocommit=default for select 1; --error ER_SET_STATEMENT_NOT_SUPPORTED -set statement tx_isolation=default for select 1; ---error ER_SET_STATEMENT_NOT_SUPPORTED set statement skip_replication=default for select 1; --error ER_SET_STATEMENT_NOT_SUPPORTED set statement sql_log_off=default for select 1; diff --git a/mysql-test/main/trans_read_only.result b/mysql-test/main/trans_read_only.result index 5e86b0993cd..acced0a059f 100644 --- a/mysql-test/main/trans_read_only.result +++ b/mysql-test/main/trans_read_only.result @@ -4,22 +4,22 @@ # # Test9: The --transaction-read-only startup option. # Check that the option was set by the .opt file. -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 1 # Also for new connections. connect con1, localhost, root; -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 1 SET SESSION TRANSACTION READ WRITE; -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 0 disconnect con1; connection default; -SELECT @@tx_read_only; -@@tx_read_only +SELECT @@transaction_read_only; +@@transaction_read_only 1 # # Test 10: SET TRANSACTION / START TRANSACTION + implicit commit. diff --git a/mysql-test/main/trans_read_only.test b/mysql-test/main/trans_read_only.test index 38b2a833216..d8c2f20b6a9 100644 --- a/mysql-test/main/trans_read_only.test +++ b/mysql-test/main/trans_read_only.test @@ -8,18 +8,18 @@ --echo # Test9: The --transaction-read-only startup option. --echo # Check that the option was set by the .opt file. -SELECT @@tx_read_only; +SELECT @@transaction_read_only; --echo # Also for new connections. connect (con1, localhost, root); -SELECT @@tx_read_only; +SELECT @@transaction_read_only; SET SESSION TRANSACTION READ WRITE; -SELECT @@tx_read_only; +SELECT @@transaction_read_only; disconnect con1; --source include/wait_until_disconnected.inc connection default; -SELECT @@tx_read_only; +SELECT @@transaction_read_only; --echo # diff --git a/mysql-test/main/unsafe_binlog_innodb.result b/mysql-test/main/unsafe_binlog_innodb.result index ced29926400..19956cfc84d 100644 --- a/mysql-test/main/unsafe_binlog_innodb.result +++ b/mysql-test/main/unsafe_binlog_innodb.result @@ -1,6 +1,6 @@ SET @save_timeout = @@GLOBAL.innodb_lock_wait_timeout; SET GLOBAL innodb_lock_wait_timeout = 1; -SET @save_isolation = @@GLOBAL.tx_isolation; +SET @save_isolation = @@GLOBAL.transaction_isolation; SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; create table t1 (id int not null, f_id int not null, f int not null, @@ -192,4 +192,4 @@ disconnect i; disconnect j; drop table t1, t2, t3, t5, t6, t8, t9; SET GLOBAL innodb_lock_wait_timeout = @save_timeout; -SET GLOBAL tx_isolation = @save_isolation; +SET GLOBAL transaction_isolation = @save_isolation; diff --git a/mysql-test/main/unsafe_binlog_innodb.test b/mysql-test/main/unsafe_binlog_innodb.test index abd2c58de30..0f57c60cd61 100644 --- a/mysql-test/main/unsafe_binlog_innodb.test +++ b/mysql-test/main/unsafe_binlog_innodb.test @@ -15,10 +15,10 @@ let $engine_type= InnoDB; SET @save_timeout = @@GLOBAL.innodb_lock_wait_timeout; SET GLOBAL innodb_lock_wait_timeout = 1; -SET @save_isolation = @@GLOBAL.tx_isolation; +SET @save_isolation = @@GLOBAL.transaction_isolation; SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED; --source include/unsafe_binlog.inc SET GLOBAL innodb_lock_wait_timeout = @save_timeout; -SET GLOBAL tx_isolation = @save_isolation; +SET GLOBAL transaction_isolation = @save_isolation; diff --git a/mysql-test/main/variables.result b/mysql-test/main/variables.result index 9b54a24be71..4359a8eef01 100644 --- a/mysql-test/main/variables.result +++ b/mysql-test/main/variables.result @@ -548,7 +548,7 @@ set default_storage_engine=myisam; set global thread_cache_size=100; set timestamp=1, timestamp=default; set tmp_table_size=1024; -set tx_isolation="READ-COMMITTED"; +set transaction_isolation="READ-COMMITTED"; set wait_timeout=100; set log_warnings=1; set global log_warnings=1; diff --git a/mysql-test/main/variables.test b/mysql-test/main/variables.test index 89267560ca6..77c6a153304 100644 --- a/mysql-test/main/variables.test +++ b/mysql-test/main/variables.test @@ -336,7 +336,7 @@ set default_storage_engine=myisam; set global thread_cache_size=100; set timestamp=1, timestamp=default; set tmp_table_size=1024; -set tx_isolation="READ-COMMITTED"; +set transaction_isolation="READ-COMMITTED"; set wait_timeout=100; set log_warnings=1; set global log_warnings=1; |