-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
remove unnecessary drop database/table from slave_trx_isolation.test
add simplified slave_trx_isolation.test
- Loading branch information
Showing
7 changed files
with
250 additions
and
25 deletions.
There are no files selected for viewing
15 changes: 15 additions & 0 deletions
15
storage/spider/mysql-test/spider/bugfix/include/slave_trx_isolation_deinit.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--let $MASTER_1_COMMENT_2_1= $MASTER_1_COMMENT_2_1_BACKUP | ||
--let $CHILD2_1_DROP_TABLES= $CHILD2_1_DROP_TABLES_BACKUP | ||
--let $CHILD2_1_CREATE_TABLES= $CHILD2_1_CREATE_TABLES_BACKUP | ||
--let $CHILD2_1_SELECT_TABLES= $CHILD2_1_SELECT_TABLES_BACKUP | ||
--connection slave1_1 | ||
set global spider_slave_trx_isolation= @old_spider_slave_trx_isolation; | ||
--disable_warnings | ||
--disable_query_log | ||
--disable_result_log | ||
--source ../include/deinit_spider.inc | ||
--source ../t/slave_test_deinit.inc | ||
--source ../t/test_deinit.inc | ||
--enable_result_log | ||
--enable_query_log | ||
--enable_warnings |
35 changes: 35 additions & 0 deletions
35
storage/spider/mysql-test/spider/bugfix/include/slave_trx_isolation_init.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
--disable_warnings | ||
--disable_query_log | ||
--disable_result_log | ||
--source ../t/test_init.inc | ||
--source ../t/slave_test_init.inc | ||
--enable_result_log | ||
--enable_query_log | ||
--enable_warnings | ||
--let $MASTER_1_COMMENT_2_1_BACKUP= $MASTER_1_COMMENT_2_1 | ||
let $MASTER_1_COMMENT_2_1= | ||
COMMENT='table "tbl_a", srv "s_2_1"'; | ||
--let $CHILD2_1_DROP_TABLES_BACKUP= $CHILD2_1_DROP_TABLES | ||
let $CHILD2_1_DROP_TABLES= | ||
DROP TABLE IF EXISTS tbl_a; | ||
--let $CHILD2_1_CREATE_TABLES_BACKUP= $CHILD2_1_CREATE_TABLES | ||
let $CHILD2_1_CREATE_TABLES= | ||
CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
PRIMARY KEY (pkey) | ||
) $CHILD2_1_ENGINE $CHILD2_1_CHARSET; | ||
--let $CHILD2_1_SELECT_TABLES_BACKUP= $CHILD2_1_SELECT_TABLES | ||
let $CHILD2_1_SELECT_TABLES= | ||
SELECT pkey FROM tbl_a ORDER BY pkey; | ||
let $CHILD2_1_SELECT_ARGUMENT1= | ||
SELECT argument FROM mysql.general_log WHERE argument LIKE '%set %'; | ||
--connection slave1_1 | ||
--disable_warnings | ||
--disable_query_log | ||
--disable_result_log | ||
--source ../include/init_spider.inc | ||
--enable_result_log | ||
--enable_query_log | ||
--enable_warnings | ||
set @old_spider_slave_trx_isolation= @@spider_slave_trx_isolation; | ||
set global spider_slave_trx_isolation= 1; |
99 changes: 99 additions & 0 deletions
99
storage/spider/mysql-test/spider/bugfix/r/slave_trx_isolation.result
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
for master_1 | ||
for child2 | ||
child2_1 | ||
child2_2 | ||
child2_3 | ||
for child3 | ||
for slave1_1 | ||
connection slave1_1; | ||
set @old_spider_slave_trx_isolation= @@spider_slave_trx_isolation; | ||
set global spider_slave_trx_isolation= 1; | ||
|
||
drop and create databases | ||
connection master_1; | ||
CREATE DATABASE auto_test_local; | ||
USE auto_test_local; | ||
connection slave1_1; | ||
CREATE DATABASE auto_test_local; | ||
USE auto_test_local; | ||
connection child2_1; | ||
SET @old_log_output = @@global.log_output; | ||
SET GLOBAL log_output = 'TABLE,FILE'; | ||
CREATE DATABASE auto_test_remote; | ||
USE auto_test_remote; | ||
|
||
create table and insert | ||
connection child2_1; | ||
CHILD2_1_CREATE_TABLES | ||
TRUNCATE TABLE mysql.general_log; | ||
connection master_1; | ||
connection slave1_1; | ||
connection master_1; | ||
SET SESSION sql_log_bin= 0; | ||
CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
PRIMARY KEY (pkey) | ||
) MASTER_1_ENGINE2 MASTER_1_CHARSET MASTER_1_COMMENT_2_1 | ||
SET SESSION sql_log_bin= 1; | ||
connection slave1_1; | ||
CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
PRIMARY KEY (pkey) | ||
) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1 | ||
connection master_1; | ||
INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); | ||
connection slave1_1; | ||
connection master_1; | ||
SET SESSION sql_log_bin= 0; | ||
connection child2_1; | ||
SELECT argument FROM mysql.general_log WHERE argument LIKE '%set %'; | ||
argument | ||
set session time_zone = '+00:00' | ||
SET NAMES utf8 | ||
set session transaction isolation level read committed;set session autocommit = 1;start transaction | ||
SELECT argument FROM mysql.general_log WHERE argument LIKE '%set %' | ||
SELECT pkey FROM tbl_a ORDER BY pkey; | ||
pkey | ||
0 | ||
1 | ||
2 | ||
3 | ||
4 | ||
5 | ||
6 | ||
7 | ||
8 | ||
9 | ||
connection slave1_1; | ||
SELECT pkey FROM tbl_a ORDER BY pkey; | ||
pkey | ||
0 | ||
1 | ||
2 | ||
3 | ||
4 | ||
5 | ||
6 | ||
7 | ||
8 | ||
9 | ||
|
||
deinit | ||
connection master_1; | ||
DROP DATABASE IF EXISTS auto_test_local; | ||
connection slave1_1; | ||
DROP DATABASE IF EXISTS auto_test_local; | ||
connection child2_1; | ||
DROP DATABASE IF EXISTS auto_test_remote; | ||
SET GLOBAL log_output = @old_log_output; | ||
connection slave1_1; | ||
set global spider_slave_trx_isolation= @old_spider_slave_trx_isolation; | ||
for slave1_1 | ||
for master_1 | ||
for child2 | ||
child2_1 | ||
child2_2 | ||
child2_3 | ||
for child3 | ||
|
||
end of test |
4 changes: 4 additions & 0 deletions
4
storage/spider/mysql-test/spider/bugfix/t/slave_trx_isolation.cnf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
!include include/default_mysqld.cnf | ||
!include ../my_1_1.cnf | ||
!include ../my_2_1.cnf | ||
!include ../my_4_1.cnf |
95 changes: 95 additions & 0 deletions
95
storage/spider/mysql-test/spider/bugfix/t/slave_trx_isolation.test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
--source ../include/slave_trx_isolation_init.inc | ||
--echo | ||
--echo drop and create databases | ||
--connection master_1 | ||
--disable_warnings | ||
CREATE DATABASE auto_test_local; | ||
USE auto_test_local; | ||
|
||
--connection slave1_1 | ||
CREATE DATABASE auto_test_local; | ||
USE auto_test_local; | ||
|
||
--connection child2_1 | ||
SET @old_log_output = @@global.log_output; | ||
SET GLOBAL log_output = 'TABLE,FILE'; | ||
CREATE DATABASE auto_test_remote; | ||
USE auto_test_remote; | ||
--enable_warnings | ||
|
||
--echo | ||
--echo create table and insert | ||
|
||
--connection child2_1 | ||
--disable_query_log | ||
echo CHILD2_1_CREATE_TABLES; | ||
eval $CHILD2_1_CREATE_TABLES; | ||
--enable_query_log | ||
TRUNCATE TABLE mysql.general_log; | ||
|
||
--connection master_1 | ||
save_master_pos; | ||
|
||
--connection slave1_1 | ||
sync_with_master; | ||
|
||
--connection master_1 | ||
SET SESSION sql_log_bin= 0; | ||
--disable_query_log | ||
echo CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
PRIMARY KEY (pkey) | ||
) MASTER_1_ENGINE2 MASTER_1_CHARSET MASTER_1_COMMENT_2_1; | ||
eval CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
PRIMARY KEY (pkey) | ||
) $MASTER_1_ENGINE2 $MASTER_1_CHARSET $MASTER_1_COMMENT_2_1; | ||
--enable_query_log | ||
SET SESSION sql_log_bin= 1; | ||
|
||
--connection slave1_1 | ||
--disable_query_log | ||
echo CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
PRIMARY KEY (pkey) | ||
) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1; | ||
eval CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
PRIMARY KEY (pkey) | ||
) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_2_1; | ||
--enable_query_log | ||
|
||
--connection master_1 | ||
INSERT INTO tbl_a (pkey) VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); | ||
save_master_pos; | ||
|
||
--connection slave1_1 | ||
sync_with_master; | ||
|
||
--connection master_1 | ||
SET SESSION sql_log_bin= 0; | ||
|
||
--connection child2_1 | ||
eval $CHILD2_1_SELECT_ARGUMENT1; | ||
eval $CHILD2_1_SELECT_TABLES; | ||
|
||
--connection slave1_1 | ||
SELECT pkey FROM tbl_a ORDER BY pkey; | ||
|
||
--echo | ||
--echo deinit | ||
--disable_warnings | ||
--connection master_1 | ||
DROP DATABASE IF EXISTS auto_test_local; | ||
|
||
--connection slave1_1 | ||
DROP DATABASE IF EXISTS auto_test_local; | ||
|
||
--connection child2_1 | ||
DROP DATABASE IF EXISTS auto_test_remote; | ||
SET GLOBAL log_output = @old_log_output; | ||
|
||
--enable_warnings | ||
--source ../include/slave_trx_isolation_deinit.inc | ||
--echo | ||
--echo end of test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters