diff options
Diffstat (limited to 'mysql-test/suite/parts')
31 files changed, 257 insertions, 249 deletions
diff --git a/mysql-test/suite/parts/inc/part_exch_qa_5.inc b/mysql-test/suite/parts/inc/part_exch_qa_5.inc index 1ad28df5f8c..6825571165c 100644 --- a/mysql-test/suite/parts/inc/part_exch_qa_5.inc +++ b/mysql-test/suite/parts/inc/part_exch_qa_5.inc @@ -7,7 +7,6 @@ GRANT USAGE ON *.* TO test2@localhost; GRANT CREATE, DROP, INSERT, SELECT ON test.* TO test1@localhost; GRANT CREATE, DROP, ALTER, UPDATE, INSERT, SELECT ON test.* TO test2@localhost; ---echo connect (test1,localhost,test1,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (test1,localhost,test1,,test,$MASTER_MYPORT,$MASTER_MYSOCK); SELECT current_user(); SHOW GRANTS FOR CURRENT_USER; @@ -18,11 +17,9 @@ SHOW GRANTS FOR CURRENT_USER; --enable_query_log --error ER_TABLEACCESS_DENIED_ERROR ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; ---echo disconnect test1; disconnect test1; ---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK); USE test; SELECT current_user(); @@ -52,14 +49,11 @@ ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00; SELECT * FROM tsp_00; --sorted_result SELECT * FROM tsp WHERE a BETWEEN 0 AND 10; ---echo disconnect test2; disconnect test2; ---echo connection default; connection default; REVOKE ALTER ON test.* FROM test2@localhost; ---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK); USE test; SELECT current_user(); @@ -77,9 +71,7 @@ ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00; --error ER_TABLEACCESS_DENIED_ERROR ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00; ---echo connection default; connection default; ---echo disconnect test2; disconnect test2; --source suite/parts/inc/part_exch_drop_tabs.inc diff --git a/mysql-test/suite/parts/inc/part_exch_qa_7.inc b/mysql-test/suite/parts/inc/part_exch_qa_7.inc index d8809902d51..e6276fe3ca2 100644 --- a/mysql-test/suite/parts/inc/part_exch_qa_7.inc +++ b/mysql-test/suite/parts/inc/part_exch_qa_7.inc @@ -14,7 +14,6 @@ CREATE USER test_2@localhost; --send ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; ---echo connect (test_2,localhost,test_2,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (test_2,localhost,test_2,,test,$MASTER_MYPORT,$MASTER_MYSOCK); # Wait until exchange has been done. let $wait_condition= SELECT count(a)>0 FROM tp WHERE a=1; @@ -31,7 +30,6 @@ INSERT INTO tp VALUES (7,"Seven"); SELECT * FROM tp WHERE a BETWEEN 0 AND 10; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; ---echo connection default; connection default; --echo reap; reap; @@ -40,7 +38,6 @@ SELECT * FROM t_10; --sorted_result SELECT * FROM tp WHERE a BETWEEN 0 AND 10; ---echo connection test_2; connection test_2; let $wait_condition= SELECT count(a)>0 FROM tp WHERE a=2; --source include/wait_condition.inc @@ -48,10 +45,8 @@ let $wait_condition= SELECT count(a)>0 FROM tp WHERE a=2; SELECT * FROM t_10; --sorted_result SELECT * FROM tp WHERE a BETWEEN 0 AND 10; ---echo disconnect test_2; disconnect test_2; ---echo connection default; connection default; --sorted_result SELECT * FROM t_10; @@ -60,4 +55,3 @@ SELECT * FROM tp WHERE a BETWEEN 0 AND 10; --source suite/parts/inc/part_exch_drop_tabs.inc DROP USER test_2@localhost; - diff --git a/mysql-test/suite/parts/inc/part_exch_qa_8.inc b/mysql-test/suite/parts/inc/part_exch_qa_8.inc index af0b5a9c6cd..56c050e3481 100644 --- a/mysql-test/suite/parts/inc/part_exch_qa_8.inc +++ b/mysql-test/suite/parts/inc/part_exch_qa_8.inc @@ -20,7 +20,6 @@ GRANT CREATE, ALTER, DROP, INSERT, SELECT on test.* TO test2@localhost; GRANT CREATE, ALTER, DROP, INSERT, SELECT on testdb.* TO test2@localhost; # 8) Exchanges partition and table and back in 2 sessions with 2 databases. ---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK); # Privileges on both DB's ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10; @@ -46,26 +45,20 @@ ALTER TABLE testdb.tp EXCHANGE PARTITION p0 WITH TABLE t_10; SELECT * FROM t_10; --sorted_result SELECT * FROM testdb.tp WHERE a BETWEEN 0 AND 10; ---echo disconnect test2; disconnect test2; ---echo connection default; connection default; REVOKE INSERT ON testdb.* FROM test2@localhost; ---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK); --error ER_TABLEACCESS_DENIED_ERROR ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10; --error ER_TABLEACCESS_DENIED_ERROR ALTER TABLE testdb.tp EXCHANGE PARTITION p0 WITH TABLE t_10; ---echo disconnect test2; disconnect test2; ---echo connection default; connection default; --source suite/parts/inc/part_exch_drop_tabs.inc DROP USER test2@localhost; DROP DATABASE testdb; - diff --git a/mysql-test/suite/parts/inc/partition_auto_increment.inc b/mysql-test/suite/parts/inc/partition_auto_increment.inc index e3a8d681275..199c8680864 100644 --- a/mysql-test/suite/parts/inc/partition_auto_increment.inc +++ b/mysql-test/suite/parts/inc/partition_auto_increment.inc @@ -356,7 +356,6 @@ DROP TABLE t1; -- echo # Test with two threads connection default; --- echo # con default eval CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = $engine PARTITION BY HASH(c1) @@ -365,32 +364,26 @@ INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); connect(con1, localhost, root,,); connection con1; --- echo # con1 INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); connection default; --- echo # con default INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); --- echo # con1 connection con1; INSERT INTO t1 (c1) VALUES (NULL); connection default; --- echo # con default -- error 0, ER_DUP_ENTRY, ER_DUP_KEY INSERT INTO t1 (c1) VALUES (16); if ($mysql_errno) { echo # ERROR (only OK if Archive) mysql_errno: $mysql_errno; } --- echo # con1 connection con1; INSERT INTO t1 (c1) VALUES (NULL); disconnect con1; connection default; --- echo # con default INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; DROP TABLE t1; @@ -398,35 +391,29 @@ DROP TABLE t1; -- echo # Test with two threads + start transaction NO PARTITIONING connect(con1, localhost, root,,); connection default; --- echo # con default eval CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = $engine; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); connection con1; --- echo # con1 START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); connection default; --- echo # con default INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); --- echo # con1 connection con1; INSERT INTO t1 (c1) VALUES (NULL); connection default; --- echo # con default -- error 0, ER_DUP_KEY INSERT INTO t1 (c1) VALUES (16); if ($mysql_errno) { echo # ERROR (only OK if Archive) mysql_errno: $mysql_errno; } --- echo # con1 connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; @@ -434,7 +421,6 @@ COMMIT; SELECT * FROM t1 ORDER BY c1; disconnect con1; connection default; --- echo # con default INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; COMMIT; @@ -444,7 +430,6 @@ DROP TABLE t1; -- echo # Test with two threads + start transaction connect(con1, localhost, root,,); connection default; --- echo # con default eval CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = $engine PARTITION BY HASH(c1) @@ -453,25 +438,20 @@ START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); connection con1; --- echo # con1 START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL), (10); connection default; --- echo # con default INSERT INTO t1 (c1) VALUES (NULL), (NULL), (19); INSERT INTO t1 (c1) VALUES (21); --- echo # con1 connection con1; INSERT INTO t1 (c1) VALUES (NULL); connection default; --- echo # con default -- error 0, ER_DUP_ENTRY, ER_DUP_KEY INSERT INTO t1 (c1) VALUES (16); if ($mysql_errno) { echo # ERROR (only OK if Archive) mysql_errno: $mysql_errno; } --- echo # con1 connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; @@ -479,7 +459,6 @@ COMMIT; SELECT * FROM t1 ORDER BY c1; disconnect con1; connection default; --- echo # con default INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; COMMIT; diff --git a/mysql-test/suite/parts/inc/partition_exchange.inc b/mysql-test/suite/parts/inc/partition_exchange.inc index f5ecddd13a4..95a67a339d0 100644 --- a/mysql-test/suite/parts/inc/partition_exchange.inc +++ b/mysql-test/suite/parts/inc/partition_exchange.inc @@ -152,7 +152,6 @@ SELECT * FROM tp; SET AUTOCOMMIT = 1; connect(con1, localhost, root,,); ---echo # con1 SET DEBUG_SYNC= 'swap_partition_after_compare_tables SIGNAL swap_in_progress WAIT_FOR goto_verification'; SET DEBUG_SYNC= 'swap_partition_first_row_read SIGNAL swap_in_progress WAIT_FOR goto_wait'; SET DEBUG_SYNC= 'swap_partition_after_wait SIGNAL swap_in_progress WAIT_FOR goto_rename'; @@ -160,7 +159,6 @@ SET DEBUG_SYNC= 'swap_partition_before_rename SIGNAL swap_in_progress WAIT_FOR t send ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t; connection default; ---echo # con default SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; --echo # select from t and select/update/delete/insert from tp should work SELECT * FROM t WHERE a = 99; @@ -315,10 +313,8 @@ SHOW CREATE TABLE tp; SET DEBUG_SYNC= 'now SIGNAL test_done'; connection con1; ---echo # con1 --reap connection default; ---echo # con default --echo # Tables should now be as normal SHOW CREATE TABLE t; SHOW CREATE TABLE tp; @@ -347,7 +343,6 @@ eval ALTER TABLE tp ENGINE = $engine; disconnect con1; connection default; ---echo # con default SET DEBUG_SYNC= 'RESET'; SHOW CREATE TABLE t; SHOW CREATE TABLE tp; @@ -357,5 +352,3 @@ SELECT * FROM t; SELECT * FROM tp; DROP TABLE t, tp, tsp; - - diff --git a/mysql-test/suite/parts/r/partition_auto_increment_archive.result b/mysql-test/suite/parts/r/partition_auto_increment_archive.result index f62e4aa005a..c9a2103f2ce 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_archive.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_archive.result @@ -398,29 +398,31 @@ t1 CREATE TABLE `t1` ( PARTITIONS 2 */ DROP TABLE t1; # Test with two threads -# con default +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Archive' PARTITION BY HASH(c1) PARTITIONS 2; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connect con1, localhost, root,,; +connection con1; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); # ERROR (only OK if Archive) mysql_errno: 1022 -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -437,27 +439,28 @@ c1 24 DROP TABLE t1; # Test with two threads + start transaction NO PARTITIONING -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Archive'; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); # ERROR (only OK if Archive) mysql_errno: 1022 -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -484,7 +487,8 @@ c1 21 22 23 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -515,7 +519,8 @@ c1 24 DROP TABLE t1; # Test with two threads + start transaction -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Archive' PARTITION BY HASH(c1) @@ -523,18 +528,18 @@ PARTITIONS 2; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL), (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL), (NULL), (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); # ERROR (only OK if Archive) mysql_errno: 1022 -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -561,7 +566,8 @@ c1 21 22 23 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result b/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result index 03e87bc22fb..e1d5814dc45 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result @@ -356,60 +356,64 @@ t1 CREATE TABLE `t1` ( PARTITIONS 2 */ DROP TABLE t1; # Test with two threads -# con default +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Blackhole' PARTITION BY HASH(c1) PARTITIONS 2; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connect con1, localhost, root,,; +connection con1; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 DROP TABLE t1; # Test with two threads + start transaction NO PARTITIONING -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Blackhole'; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 COMMIT; SELECT * FROM t1 ORDER BY c1; c1 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -418,7 +422,8 @@ SELECT * FROM t1 ORDER BY c1; c1 DROP TABLE t1; # Test with two threads + start transaction -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Blackhole' PARTITION BY HASH(c1) @@ -426,24 +431,25 @@ PARTITIONS 2; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL), (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL), (NULL), (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 COMMIT; SELECT * FROM t1 ORDER BY c1; c1 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result index 34e47f58272..63bd8a83b70 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result @@ -445,28 +445,30 @@ t1 CREATE TABLE `t1` ( PARTITIONS 2 */ DROP TABLE t1; # Test with two threads -# con default +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'InnoDB' PARTITION BY HASH(c1) PARTITIONS 2; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connect con1, localhost, root,,; +connection con1; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -484,26 +486,27 @@ c1 24 DROP TABLE t1; # Test with two threads + start transaction NO PARTITIONING -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'InnoDB'; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -518,7 +521,8 @@ c1 10 22 23 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -551,7 +555,8 @@ c1 24 DROP TABLE t1; # Test with two threads + start transaction -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'InnoDB' PARTITION BY HASH(c1) @@ -559,17 +564,17 @@ PARTITIONS 2; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL), (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL), (NULL), (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -584,7 +589,8 @@ c1 10 22 23 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_maria.result b/mysql-test/suite/parts/r/partition_auto_increment_maria.result index b9310a2a314..9a38ae6b8d5 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_maria.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_maria.result @@ -444,28 +444,30 @@ t1 CREATE TABLE `t1` ( PARTITIONS 2 */ DROP TABLE t1; # Test with two threads -# con default +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Aria' PARTITION BY HASH(c1) PARTITIONS 2; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connect con1, localhost, root,,; +connection con1; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -483,26 +485,27 @@ c1 24 DROP TABLE t1; # Test with two threads + start transaction NO PARTITIONING -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Aria'; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -531,7 +534,8 @@ c1 21 22 23 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -564,7 +568,8 @@ c1 24 DROP TABLE t1; # Test with two threads + start transaction -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Aria' PARTITION BY HASH(c1) @@ -572,17 +577,17 @@ PARTITIONS 2; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL), (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL), (NULL), (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -611,7 +616,8 @@ c1 21 22 23 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_memory.result b/mysql-test/suite/parts/r/partition_auto_increment_memory.result index c3a5073b029..e6240f1bb40 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_memory.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_memory.result @@ -444,28 +444,30 @@ t1 CREATE TABLE `t1` ( PARTITIONS 2 */ DROP TABLE t1; # Test with two threads -# con default +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Memory' PARTITION BY HASH(c1) PARTITIONS 2; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connect con1, localhost, root,,; +connection con1; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -483,26 +485,27 @@ c1 24 DROP TABLE t1; # Test with two threads + start transaction NO PARTITIONING -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Memory'; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -531,7 +534,8 @@ c1 21 22 23 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -564,7 +568,8 @@ c1 24 DROP TABLE t1; # Test with two threads + start transaction -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'Memory' PARTITION BY HASH(c1) @@ -572,17 +577,17 @@ PARTITIONS 2; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL), (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL), (NULL), (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -611,7 +616,8 @@ c1 21 22 23 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_auto_increment_myisam.result b/mysql-test/suite/parts/r/partition_auto_increment_myisam.result index ad440155d33..32e75205f3b 100644 --- a/mysql-test/suite/parts/r/partition_auto_increment_myisam.result +++ b/mysql-test/suite/parts/r/partition_auto_increment_myisam.result @@ -444,28 +444,30 @@ t1 CREATE TABLE `t1` ( PARTITIONS 2 */ DROP TABLE t1; # Test with two threads -# con default +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'MyISAM' PARTITION BY HASH(c1) PARTITIONS 2; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connect con1, localhost, root,,; +connection con1; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -483,26 +485,27 @@ c1 24 DROP TABLE t1; # Test with two threads + start transaction NO PARTITIONING -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'MyISAM'; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (NULL); INSERT INTO t1 (c1) VALUES (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -531,7 +534,8 @@ c1 21 22 23 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -564,7 +568,8 @@ c1 24 DROP TABLE t1; # Test with two threads + start transaction -# con default +connect con1, localhost, root,,; +connection default; CREATE TABLE t1 (c1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (c1)) ENGINE = 'MyISAM' PARTITION BY HASH(c1) @@ -572,17 +577,17 @@ PARTITIONS 2; START TRANSACTION; INSERT INTO t1 (c1) VALUES (2); INSERT INTO t1 (c1) VALUES (4); -# con1 +connection con1; START TRANSACTION; INSERT INTO t1 (c1) VALUES (NULL), (10); -# con default +connection default; INSERT INTO t1 (c1) VALUES (NULL), (NULL), (19); INSERT INTO t1 (c1) VALUES (21); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); -# con default +connection default; INSERT INTO t1 (c1) VALUES (16); -# con1 +connection con1; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 @@ -611,7 +616,8 @@ c1 21 22 23 -# con default +disconnect con1; +connection default; INSERT INTO t1 (c1) VALUES (NULL); SELECT * FROM t1 ORDER BY c1; c1 diff --git a/mysql-test/suite/parts/r/partition_debug_sync_innodb.result b/mysql-test/suite/parts/r/partition_debug_sync_innodb.result index 77129d6bebb..9a62988087e 100644 --- a/mysql-test/suite/parts/r/partition_debug_sync_innodb.result +++ b/mysql-test/suite/parts/r/partition_debug_sync_innodb.result @@ -15,9 +15,9 @@ a 1 21 33 -# con1 (send) +connect con1, localhost, root,,; ALTER TABLE t1 TRUNCATE PARTITION pMax; -# con default +connection default; SELECT * FROM t1; a 1 @@ -25,9 +25,9 @@ a 33 # Commit will allow the TRUNCATE to finish COMMIT; -# con1 (reap) -# con1 (disconnect) -# default connection +connection con1; +disconnect con1; +connection default; SELECT * FROM t1; a 1 @@ -62,6 +62,7 @@ SELECT TABLE_SCHEMA, TABLE_NAME, PARTITION_NAME, PARTITION_ORDINAL_POSITION, PARTITION_DESCRIPTION, TABLE_ROWS FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test'; +connect con1, localhost, root,,; SET DEBUG_SYNC = 'now WAIT_FOR parked'; # When waiting for the name lock in get_all_tables in sql_show.cc # this will not be concurrent any more, thus the TIMEOUT @@ -73,6 +74,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p0 INTO PARTITION p10 VALUES LESS THAN MAXVALUE); Warnings: Warning 1639 debug sync point wait timed out +disconnect con1; +connection default; TABLE_SCHEMA TABLE_NAME PARTITION_NAME PARTITION_ORDINAL_POSITION PARTITION_DESCRIPTION TABLE_ROWS test t1 p0 1 10 1 test t1 p10 2 MAXVALUE 3 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result index e539c37a0b4..03ef0ed2c09 100755..100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result @@ -4,7 +4,7 @@ GRANT USAGE ON *.* TO test1@localhost; GRANT USAGE ON *.* TO test2@localhost; GRANT CREATE, DROP, INSERT, SELECT ON test.* TO test1@localhost; GRANT CREATE, DROP, ALTER, UPDATE, INSERT, SELECT ON test.* TO test2@localhost; -connect (test1,localhost,test1,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test1,localhost,test1,,test,$MASTER_MYPORT,$MASTER_MYSOCK; SELECT current_user(); current_user() test1@localhost @@ -15,7 +15,7 @@ GRANT SELECT, INSERT, CREATE, DROP ON `test`.* TO 'test1'@'localhost' ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table 'tp' disconnect test1; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; USE test; SELECT current_user(); current_user() @@ -73,7 +73,7 @@ a b disconnect test2; connection default; REVOKE ALTER ON test.* FROM test2@localhost; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; USE test; SELECT current_user(); current_user() diff --git a/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result index e539c37a0b4..03ef0ed2c09 100755..100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result @@ -4,7 +4,7 @@ GRANT USAGE ON *.* TO test1@localhost; GRANT USAGE ON *.* TO test2@localhost; GRANT CREATE, DROP, INSERT, SELECT ON test.* TO test1@localhost; GRANT CREATE, DROP, ALTER, UPDATE, INSERT, SELECT ON test.* TO test2@localhost; -connect (test1,localhost,test1,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test1,localhost,test1,,test,$MASTER_MYPORT,$MASTER_MYSOCK; SELECT current_user(); current_user() test1@localhost @@ -15,7 +15,7 @@ GRANT SELECT, INSERT, CREATE, DROP ON `test`.* TO 'test1'@'localhost' ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table 'tp' disconnect test1; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; USE test; SELECT current_user(); current_user() @@ -73,7 +73,7 @@ a b disconnect test2; connection default; REVOKE ALTER ON test.* FROM test2@localhost; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; USE test; SELECT current_user(); current_user() diff --git a/mysql-test/suite/parts/r/partition_exch_qa_6.result b/mysql-test/suite/parts/r/partition_exch_qa_6.result index 92527ab1dd9..bef277f695a 100755..100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_6.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_6.result @@ -1,7 +1,7 @@ CREATE USER test2@localhost; GRANT USAGE ON *.* TO test2@localhost; GRANT CREATE, DROP, ALTER, UPDATE, INSERT, SELECT ON test.* TO test2@localhost; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; USE test; SHOW GRANTS FOR CURRENT_USER; Grants for test2@localhost @@ -56,7 +56,7 @@ a b disconnect test2; connection default; REVOKE INSERT ON test.* FROM test2@localhost; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; USE test; SHOW GRANTS FOR CURRENT_USER; Grants for test2@localhost @@ -68,7 +68,7 @@ disconnect test2; connection default; GRANT INSERT ON test.* TO test2@localhost; REVOKE CREATE ON test.* FROM test2@localhost; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; USE test; SHOW GRANTS FOR CURRENT_USER; Grants for test2@localhost @@ -80,7 +80,7 @@ disconnect test2; connection default; GRANT CREATE ON test.* TO test2@localhost; REVOKE DROP ON test.* FROM test2@localhost; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; USE test; SHOW GRANTS FOR CURRENT_USER; Grants for test2@localhost diff --git a/mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result index 8ae4bfd3d3a..0913bbaa55b 100755..100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result @@ -1,7 +1,7 @@ CREATE USER test_2@localhost; send ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -connect (test_2,localhost,test_2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test_2,localhost,test_2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; SELECT * FROM t_10; a b 2 Two diff --git a/mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result index 8ae4bfd3d3a..0913bbaa55b 100755..100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result @@ -1,7 +1,7 @@ CREATE USER test_2@localhost; send ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; -connect (test_2,localhost,test_2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test_2,localhost,test_2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; SELECT * FROM t_10; a b 2 Two diff --git a/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result index b252fc616b1..2fd45be9261 100755..100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result @@ -4,7 +4,7 @@ USE testdb; USE test; GRANT CREATE, ALTER, DROP, INSERT, SELECT on test.* TO test2@localhost; GRANT CREATE, ALTER, DROP, INSERT, SELECT on testdb.* TO test2@localhost; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10; SELECT * FROM testdb.t_10; a b @@ -60,7 +60,7 @@ a b disconnect test2; connection default; REVOKE INSERT ON testdb.* FROM test2@localhost; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10; ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 't_10' ALTER TABLE testdb.tp EXCHANGE PARTITION p0 WITH TABLE t_10; diff --git a/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result index b252fc616b1..2fd45be9261 100755..100644 --- a/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result +++ b/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result @@ -4,7 +4,7 @@ USE testdb; USE test; GRANT CREATE, ALTER, DROP, INSERT, SELECT on test.* TO test2@localhost; GRANT CREATE, ALTER, DROP, INSERT, SELECT on testdb.* TO test2@localhost; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10; SELECT * FROM testdb.t_10; a b @@ -60,7 +60,7 @@ a b disconnect test2; connection default; REVOKE INSERT ON testdb.* FROM test2@localhost; -connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); +connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10; ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 't_10' ALTER TABLE testdb.tp EXCHANGE PARTITION p0 WITH TABLE t_10; diff --git a/mysql-test/suite/parts/r/partition_exchange_innodb.result b/mysql-test/suite/parts/r/partition_exchange_innodb.result index f0e4923d39a..3070f7c3932 100644 --- a/mysql-test/suite/parts/r/partition_exchange_innodb.result +++ b/mysql-test/suite/parts/r/partition_exchange_innodb.result @@ -147,13 +147,13 @@ a b 64 Sixty four # Start by testing read/write locking SET AUTOCOMMIT = 1; -# con1 +connect con1, localhost, root,,; SET DEBUG_SYNC= 'swap_partition_after_compare_tables SIGNAL swap_in_progress WAIT_FOR goto_verification'; SET DEBUG_SYNC= 'swap_partition_first_row_read SIGNAL swap_in_progress WAIT_FOR goto_wait'; SET DEBUG_SYNC= 'swap_partition_after_wait SIGNAL swap_in_progress WAIT_FOR goto_rename'; SET DEBUG_SYNC= 'swap_partition_before_rename SIGNAL swap_in_progress WAIT_FOR test_done'; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t; -# con default +connection default; SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; # select from t and select/update/delete/insert from tp should work SELECT * FROM t WHERE a = 99; @@ -295,8 +295,8 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction SHOW CREATE TABLE tp; ERROR HY000: Lock wait timeout exceeded; try restarting transaction SET DEBUG_SYNC= 'now SIGNAL test_done'; -# con1 -# con default +connection con1; +connection default; # Tables should now be as normal SHOW CREATE TABLE t; Table Create Table @@ -329,7 +329,8 @@ INSERT INTO tp VALUES (63, "Sixty three, new"), (59, "To be deleted"); DELETE FROM tp WHERE a = 3; ALTER TABLE t ENGINE = 'InnoDB'; ALTER TABLE tp ENGINE = 'InnoDB'; -# con default +disconnect con1; +connection default; SET DEBUG_SYNC= 'RESET'; SHOW CREATE TABLE t; Table Create Table diff --git a/mysql-test/suite/parts/r/partition_exchange_memory.result b/mysql-test/suite/parts/r/partition_exchange_memory.result index 9cc42791905..edd3667a484 100644 --- a/mysql-test/suite/parts/r/partition_exchange_memory.result +++ b/mysql-test/suite/parts/r/partition_exchange_memory.result @@ -147,13 +147,13 @@ a b 64 Sixty four # Start by testing read/write locking SET AUTOCOMMIT = 1; -# con1 +connect con1, localhost, root,,; SET DEBUG_SYNC= 'swap_partition_after_compare_tables SIGNAL swap_in_progress WAIT_FOR goto_verification'; SET DEBUG_SYNC= 'swap_partition_first_row_read SIGNAL swap_in_progress WAIT_FOR goto_wait'; SET DEBUG_SYNC= 'swap_partition_after_wait SIGNAL swap_in_progress WAIT_FOR goto_rename'; SET DEBUG_SYNC= 'swap_partition_before_rename SIGNAL swap_in_progress WAIT_FOR test_done'; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t; -# con default +connection default; SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; # select from t and select/update/delete/insert from tp should work SELECT * FROM t WHERE a = 99; @@ -295,8 +295,8 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction SHOW CREATE TABLE tp; ERROR HY000: Lock wait timeout exceeded; try restarting transaction SET DEBUG_SYNC= 'now SIGNAL test_done'; -# con1 -# con default +connection con1; +connection default; # Tables should now be as normal SHOW CREATE TABLE t; Table Create Table @@ -329,7 +329,8 @@ INSERT INTO tp VALUES (63, "Sixty three, new"), (59, "To be deleted"); DELETE FROM tp WHERE a = 3; ALTER TABLE t ENGINE = 'Memory'; ALTER TABLE tp ENGINE = 'Memory'; -# con default +disconnect con1; +connection default; SET DEBUG_SYNC= 'RESET'; SHOW CREATE TABLE t; Table Create Table diff --git a/mysql-test/suite/parts/r/partition_exchange_myisam.result b/mysql-test/suite/parts/r/partition_exchange_myisam.result index c31e2a6ee89..9ad0b9f2728 100644 --- a/mysql-test/suite/parts/r/partition_exchange_myisam.result +++ b/mysql-test/suite/parts/r/partition_exchange_myisam.result @@ -147,13 +147,13 @@ a b 64 Sixty four # Start by testing read/write locking SET AUTOCOMMIT = 1; -# con1 +connect con1, localhost, root,,; SET DEBUG_SYNC= 'swap_partition_after_compare_tables SIGNAL swap_in_progress WAIT_FOR goto_verification'; SET DEBUG_SYNC= 'swap_partition_first_row_read SIGNAL swap_in_progress WAIT_FOR goto_wait'; SET DEBUG_SYNC= 'swap_partition_after_wait SIGNAL swap_in_progress WAIT_FOR goto_rename'; SET DEBUG_SYNC= 'swap_partition_before_rename SIGNAL swap_in_progress WAIT_FOR test_done'; ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t; -# con default +connection default; SET DEBUG_SYNC= 'now WAIT_FOR swap_in_progress'; # select from t and select/update/delete/insert from tp should work SELECT * FROM t WHERE a = 99; @@ -295,8 +295,8 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction SHOW CREATE TABLE tp; ERROR HY000: Lock wait timeout exceeded; try restarting transaction SET DEBUG_SYNC= 'now SIGNAL test_done'; -# con1 -# con default +connection con1; +connection default; # Tables should now be as normal SHOW CREATE TABLE t; Table Create Table @@ -329,7 +329,8 @@ INSERT INTO tp VALUES (63, "Sixty three, new"), (59, "To be deleted"); DELETE FROM tp WHERE a = 3; ALTER TABLE t ENGINE = 'MyISAM'; ALTER TABLE tp ENGINE = 'MyISAM'; -# con default +disconnect con1; +connection default; SET DEBUG_SYNC= 'RESET'; SHOW CREATE TABLE t; Table Create Table diff --git a/mysql-test/suite/parts/r/partition_innodb_status_file.result b/mysql-test/suite/parts/r/partition_innodb_status_file.result index 29b5a3b3766..13cc9b094c3 100644 --- a/mysql-test/suite/parts/r/partition_innodb_status_file.result +++ b/mysql-test/suite/parts/r/partition_innodb_status_file.result @@ -2,13 +2,14 @@ CREATE TABLE t1 (a INT) ENGINE = InnoDB PARTITION BY HASH(a); INSERT INTO t1 VALUES (0), (1), (2); START TRANSACTION; UPDATE t1 SET a = 5 WHERE a = 1; -# Connection con1 +connect con1, localhost, root,,; # InnoDB lock timeout and monitor thread runs every 15 seconds SET innodb_lock_wait_timeout = 20; START TRANSACTION; UPDATE t1 SET a = 3 WHERE a = 1; ERROR HY000: Lock wait timeout exceeded; try restarting transaction COMMIT; -# Connection default +disconnect con1; +connection default; COMMIT; DROP TABLE t1; diff --git a/mysql-test/suite/parts/r/partition_special_innodb.result b/mysql-test/suite/parts/r/partition_special_innodb.result index 1a513aa3d5f..78d15373924 100644 --- a/mysql-test/suite/parts/r/partition_special_innodb.result +++ b/mysql-test/suite/parts/r/partition_special_innodb.result @@ -215,22 +215,33 @@ PRIMARY KEY (a)) ENGINE = InnoDB PARTITION BY HASH (a) PARTITIONS 2; +connect con1, localhost, root,,; +connect con2, localhost, root,,; +connection con1; SET autocommit=OFF; START TRANSACTION; INSERT INTO t1 VALUES (NULL, 'first row t2'); +connection con2; SET autocommit=OFF; SET SESSION lock_wait_timeout= 1; ALTER TABLE t1 AUTO_INCREMENT = 10; ERROR HY000: Lock wait timeout exceeded; try restarting transaction +disconnect con2; +disconnect con1; +connection default; DROP TABLE t1; # # Bug#53676: Unexpected errors and possible table corruption on # ADD PARTITION and LOCK TABLE +connect con1,localhost,root,,; CREATE TABLE t1 ( i INT NOT NULL AUTO_INCREMENT PRIMARY KEY, f INT ) ENGINE = InnoDB PARTITION BY HASH(i) PARTITIONS 2; +connect con2,localhost,root,,; SET lock_wait_timeout = 2; +connection con1; #Connection 1 locks the table LOCK TABLE t1 READ; +connection con2; # Connection 2 tries to add partitions: # First attempt: lock wait timeout (as expected) ALTER TABLE t1 ADD PARTITION PARTITIONS 2; @@ -238,9 +249,11 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction # Second attempt: says that partition already exists ALTER TABLE t1 ADD PARTITION PARTITIONS 2; ERROR HY000: Lock wait timeout exceeded; try restarting transaction +connection con1; # Connection 1 unlocks the table and locks it again: UNLOCK TABLES; LOCK TABLE t1 READ; +connection con2; # Connection 2 tries again to add partitions: # Third attempt: says that the table does not exist ALTER TABLE t1 ADD PARTITION PARTITIONS 2; @@ -249,39 +262,57 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK +connection con1; UNLOCK TABLES; +connection con2; DROP TABLE t1; +connection con1; CREATE TABLE t2 ( i INT NOT NULL AUTO_INCREMENT PRIMARY KEY, f INT ) ENGINE = InnoDB PARTITION BY HASH(i) PARTITIONS 2; +connection con2; SET lock_wait_timeout = 2; +connection con1; LOCK TABLE t2 READ; +connection con2; ALTER TABLE t2 ADD PARTITION PARTITIONS 2; ERROR HY000: Lock wait timeout exceeded; try restarting transaction ALTER TABLE t2 ADD PARTITION PARTITIONS 2; +connection con1; UNLOCK TABLES; +connection con2; +connect con3,localhost,root,,; CHECK TABLE t2; Table Op Msg_type Msg_text test.t2 check status OK SELECT * FROM t2; i f DROP TABLE t2; +connection con1; CREATE TABLE t3 ( i INT NOT NULL AUTO_INCREMENT PRIMARY KEY, f INT ) ENGINE = InnoDB PARTITION BY HASH(i) PARTITIONS 2; +connection con2; SET lock_wait_timeout = 2; +connection con1; # Connection 1 locks the table LOCK TABLE t3 READ; +connection con2; # Connection 2 tries to add partitions (timeout): ALTER TABLE t3 ADD PARTITION PARTITIONS 2; ERROR HY000: Lock wait timeout exceeded; try restarting transaction +connection con3; SET lock_wait_timeout = 2; # Connection 3 tries to add partitions (partition already exists): ALTER TABLE t3 ADD PARTITION PARTITIONS 2; ERROR HY000: Lock wait timeout exceeded; try restarting transaction +connect con4,localhost,root,,; # Connection 4 tries to rename the table: RENAME TABLE t3 TO t4; +connection con1; # Connection 1 unlocks the table: UNLOCK TABLES; +connection con4; # Connection 4 gets error on rename: +connect con5,localhost,root,,; # SHOW TABLES returns the table (not renamed): SHOW TABLES; Tables_in_test @@ -290,3 +321,9 @@ t4 SELECT * FROM t3; ERROR 42S02: Table 'test.t3' doesn't exist DROP TABLE t4; +disconnect con5; +disconnect con4; +disconnect con3; +disconnect con2; +disconnect con1; +connection default; diff --git a/mysql-test/suite/parts/r/partition_special_myisam.result b/mysql-test/suite/parts/r/partition_special_myisam.result index d300d6d2d44..9e82019e9bc 100644 --- a/mysql-test/suite/parts/r/partition_special_myisam.result +++ b/mysql-test/suite/parts/r/partition_special_myisam.result @@ -212,17 +212,19 @@ drop table t1; # after timed out COALESCE PARTITION CREATE TABLE t1 ( i INT NOT NULL AUTO_INCREMENT PRIMARY KEY, f INT ) ENGINE = MyISAM PARTITION BY HASH(i) PARTITIONS 3; -# Connection 1 starts transaction and gets lock START TRANSACTION; SELECT * FROM t1; i f +connect con2,localhost,root,,; SET lock_wait_timeout = 2; -# Connection 2 tries to coalesce partitions (timeout): ALTER TABLE t1 COALESCE PARTITION 2; ERROR HY000: Lock wait timeout exceeded; try restarting transaction -# Connection 3 tries to load into the table: +connect con3,localhost,root,,; LOAD DATA INFILE 'load.in' INTO TABLE t1 (f); -# Connection 1 commits the transaction +connection default; COMMIT; -# Connection 3... +connection con3; DROP TABLE t1; +disconnect con3; +disconnect con2; +connection default; diff --git a/mysql-test/suite/parts/r/rpl_partition.result b/mysql-test/suite/parts/r/rpl_partition.result index 2e6f0a5d1ba..9969d53a3d7 100644 --- a/mysql-test/suite/parts/r/rpl_partition.result +++ b/mysql-test/suite/parts/r/rpl_partition.result @@ -7,7 +7,7 @@ SET SESSION binlog_format = 'ROW'; select @@global.binlog_format, @@session.binlog_format; @@global.binlog_format ROW @@session.binlog_format ROW -[on slave] +connection slave; set @old_global_binlog_format= @@global.binlog_format; set @old_session_binlog_format= @@session.binlog_format; SET GLOBAL binlog_format = 'ROW'; @@ -17,7 +17,7 @@ select @@global.binlog_format, @@session.binlog_format; @@session.binlog_format ROW include/stop_slave.inc include/start_slave.inc -[on master] +connection master; CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT, dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB, fkid MEDIUMINT, filler VARCHAR(255), @@ -122,6 +122,8 @@ CALL p3(); commit; SELECT count(*) as "Master byrange" FROM t3; Master byrange 500 +connection slave; +connection slave; show create table t3; Table t3 Create Table CREATE TABLE `t3` ( @@ -154,13 +156,14 @@ SELECT count(*) "Slave bykey" FROM t2; Slave bykey 500 SELECT count(*) "Slave byrange" FROM t3; Slave byrange 500 +connection master; set @@global.binlog_format= @old_global_binlog_format; set @@session.binlog_format= @old_session_binlog_format; DROP TABLE t1, t2, t3; DROP PROCEDURE p1; DROP PROCEDURE p2; DROP PROCEDURE p3; -[on slave] +connection slave; set @@global.binlog_format= @old_global_binlog_format; set @@session.binlog_format= @old_session_binlog_format; include/rpl_end.inc diff --git a/mysql-test/suite/parts/t/partition_debug_sync_innodb.test b/mysql-test/suite/parts/t/partition_debug_sync_innodb.test index df9c06011c2..d73333c3b8d 100644 --- a/mysql-test/suite/parts/t/partition_debug_sync_innodb.test +++ b/mysql-test/suite/parts/t/partition_debug_sync_innodb.test @@ -20,12 +20,10 @@ DELETE FROM t1 WHERE a = 11; SELECT * FROM t1; --connect (con1, localhost, root,,) ---echo # con1 (send) --send ALTER TABLE t1 TRUNCATE PARTITION pMax; --connection default ---echo # con default let $wait_condition= SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE = "Waiting for table metadata lock" AND @@ -36,13 +34,10 @@ SELECT * FROM t1; --echo # Commit will allow the TRUNCATE to finish COMMIT; ---echo # con1 (reap) --connection con1 --reap ---echo # con1 (disconnect) --disconnect con1 --connection default ---echo # default connection SELECT * FROM t1; DROP TABLE t1; diff --git a/mysql-test/suite/parts/t/partition_exch_qa_6.test b/mysql-test/suite/parts/t/partition_exch_qa_6.test index bad1e134af7..69b49a32813 100644 --- a/mysql-test/suite/parts/t/partition_exch_qa_6.test +++ b/mysql-test/suite/parts/t/partition_exch_qa_6.test @@ -19,7 +19,6 @@ CREATE USER test2@localhost; GRANT USAGE ON *.* TO test2@localhost; GRANT CREATE, DROP, ALTER, UPDATE, INSERT, SELECT ON test.* TO test2@localhost; ---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK); USE test; SHOW GRANTS FOR CURRENT_USER; @@ -47,56 +46,44 @@ ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00; SELECT * FROM tsp_00; --sorted_result SELECT * FROM tsp WHERE a BETWEEN 0 AND 10; ---echo disconnect test2; disconnect test2; ---echo connection default; connection default; REVOKE INSERT ON test.* FROM test2@localhost; ---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK); USE test; SHOW GRANTS FOR CURRENT_USER; # Privilege for ALTER and SELECT --error ER_TABLEACCESS_DENIED_ERROR ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; ---echo disconnect test2; disconnect test2; ---echo connection default; connection default; GRANT INSERT ON test.* TO test2@localhost; REVOKE CREATE ON test.* FROM test2@localhost; ---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK); USE test; SHOW GRANTS FOR CURRENT_USER; --error ER_TABLEACCESS_DENIED_ERROR ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00; ---echo disconnect test2; disconnect test2; ---echo connection default; connection default; GRANT CREATE ON test.* TO test2@localhost; REVOKE DROP ON test.* FROM test2@localhost; ---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK); connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK); USE test; SHOW GRANTS FOR CURRENT_USER; # Privilege for ALTER and SELECT --error ER_TABLEACCESS_DENIED_ERROR ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10; ---echo disconnect test2; disconnect test2; ---echo connection default; connection default; --source suite/parts/inc/part_exch_drop_tabs.inc DROP USER test2@localhost; - diff --git a/mysql-test/suite/parts/t/partition_innodb_status_file.test b/mysql-test/suite/parts/t/partition_innodb_status_file.test index f066ce5d485..c5793d104db 100644 --- a/mysql-test/suite/parts/t/partition_innodb_status_file.test +++ b/mysql-test/suite/parts/t/partition_innodb_status_file.test @@ -6,7 +6,6 @@ INSERT INTO t1 VALUES (0), (1), (2); START TRANSACTION; UPDATE t1 SET a = 5 WHERE a = 1; connect (con1, localhost, root,,); ---echo # Connection con1 --echo # InnoDB lock timeout and monitor thread runs every 15 seconds SET innodb_lock_wait_timeout = 20; START TRANSACTION; @@ -15,6 +14,5 @@ UPDATE t1 SET a = 3 WHERE a = 1; COMMIT; disconnect con1; connection default; ---echo # Connection default COMMIT; DROP TABLE t1; diff --git a/mysql-test/suite/parts/t/partition_special_myisam.test b/mysql-test/suite/parts/t/partition_special_myisam.test index 2eac5b3bf16..5a573259373 100644 --- a/mysql-test/suite/parts/t/partition_special_myisam.test +++ b/mysql-test/suite/parts/t/partition_special_myisam.test @@ -50,13 +50,11 @@ let $engine= 'MyISAM'; CREATE TABLE t1 ( i INT NOT NULL AUTO_INCREMENT PRIMARY KEY, f INT ) ENGINE = MyISAM PARTITION BY HASH(i) PARTITIONS 3; ---echo # Connection 1 starts transaction and gets lock START TRANSACTION; SELECT * FROM t1; --connect (con2,localhost,root,,) SET lock_wait_timeout = 2; ---echo # Connection 2 tries to coalesce partitions (timeout): --error ER_LOCK_WAIT_TIMEOUT ALTER TABLE t1 COALESCE PARTITION 2; @@ -68,16 +66,13 @@ ALTER TABLE t1 COALESCE PARTITION 2; 2 3 EOF ---echo # Connection 3 tries to load into the table: send LOAD DATA INFILE 'load.in' INTO TABLE t1 (f); --connection default --real_sleep 1 ---echo # Connection 1 commits the transaction COMMIT; --connection con3 ---echo # Connection 3... --reap DROP TABLE t1; diff --git a/mysql-test/suite/parts/t/rpl_partition.test b/mysql-test/suite/parts/t/rpl_partition.test index e278b236f7b..529d94b2b31 100644 --- a/mysql-test/suite/parts/t/rpl_partition.test +++ b/mysql-test/suite/parts/t/rpl_partition.test @@ -12,7 +12,6 @@ set @old_session_binlog_format= @@session.binlog_format; SET GLOBAL binlog_format = 'ROW'; SET SESSION binlog_format = 'ROW'; select @@global.binlog_format, @@session.binlog_format; ---echo [on slave] connection slave; set @old_global_binlog_format= @@global.binlog_format; set @old_session_binlog_format= @@session.binlog_format; @@ -23,7 +22,6 @@ select @@global.binlog_format, @@session.binlog_format; # from @@global.binlog_format --source include/stop_slave.inc --source include/start_slave.inc ---echo [on master] connection master; eval CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT, @@ -168,7 +166,6 @@ DROP TABLE t1, t2, t3; DROP PROCEDURE p1; DROP PROCEDURE p2; DROP PROCEDURE p3; ---echo [on slave] sync_slave_with_master; set @@global.binlog_format= @old_global_binlog_format; set @@session.binlog_format= @old_session_binlog_format; |