Skip to content

M
mariadb
Commit 32a77ed6 authored by unknown's avatar unknown
Browse files
Options

Fix for versional test 

Mask binlog positions, error, warning and other information that are not significant for the test


mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Mask out binlog position and DBs in result of show master status
mysql-test/extra/rpl_tests/rpl_reset_slave.test:
  Mask out log positions in tests to make them version independent
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
  Mask out Error messages in reslut of show slave status
mysql-test/suite/rpl/r/rpl_000015.result:
  Mask out log positions in tests to make them version independent
  ---
  Mask out binlog position and DBs in result of show master status
mysql-test/suite/rpl/r/rpl_change_master.result:
  Mask out log positions in tests to make them version independent
mysql-test/suite/rpl/r/rpl_create_database.result:
  fix for versional test
mysql-test/suite/rpl/r/rpl_grant.result:
  fix for versional test
mysql-test/suite/rpl/r/rpl_init_slave.result:
  fix for versional test
mysql-test/suite/rpl/r/rpl_load_from_master.result:
  update result
mysql-test/suite/rpl/r/rpl_log_pos.result:
  Mask out binlog position and DBs in result of show master status
mysql-test/suite/rpl/r/rpl_rotate_logs.result:
  Mask out binlog position and DBs in result of show master status
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result:
  Mask out binlog position and DBs in result of show master status
mysql-test/suite/rpl/r/rpl_row_reset_slave.result:
  Mask out log positions in tests to make them version independent
mysql-test/suite/rpl/r/rpl_skip_error.result:
  Mask out log positions in tests to make them version independent
mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result:
  Mask out log positions in tests to make them version independent
  ---
  Mask out binlog position and DBs in result of show master status
mysql-test/suite/rpl/r/rpl_stm_reset_slave.result:
  Mask out log positions in tests to make them version independent
mysql-test/suite/rpl/r/rpl_stm_until.result:
  Mask out log positions in tests to make them version independent
mysql-test/suite/rpl/r/rpl_temporary_errors.result:
  Mask out binlog positions
mysql-test/suite/rpl/t/rpl_000015.test:
  Mask out log positions in tests to make them version independent
mysql-test/suite/rpl/t/rpl_change_master.test:
  Mask out log positions in tests to make them version independent
mysql-test/suite/rpl/t/rpl_colSize.test:
  fix for versional test
mysql-test/suite/rpl/t/rpl_create_database.test:
  fix for versional test
mysql-test/suite/rpl/t/rpl_grant.test:
  fix for versional test
mysql-test/suite/rpl/t/rpl_init_slave.test:
  fix for versional test
mysql-test/suite/rpl/t/rpl_load_from_master.test:
  fix for versional test
mysql-test/suite/rpl/t/rpl_log_pos.test:
  Mask out binlog position and DBs
mysql-test/suite/rpl/t/rpl_rotate_logs.test:
  Mask out log positions in tests to make them version independent
mysql-test/suite/rpl/t/rpl_skip_error.test:
  Mask out log positions in tests to make them version independent
mysql-test/suite/rpl/t/rpl_stm_until.test:
  Mask out log positions in tests to make them version independent
mysql-test/include/show_binary_logs.inc:
  Mask out log positions in tests to make them version independent
mysql-test/include/show_master_logs.inc:
  Mask out log positions in tests to make them version independent
mysql-test/include/show_master_status.inc:
  Mask out log positions in tests to make them version independent
  ---
  Mask out binlog position and DBs in result of show master status
mysql-test/include/show_slave_status2.inc:
  Mask out log positions in tests to make them version independent
parent 13946e0f
Show whitespace changes
Inline Side-by-side
Showing with 246 additions and 208 deletions
mysql-test/extra/rpl_tests/rpl_max_relay_size.test
View file @ 32a77ed6
...@@ -43,7 +43,7 @@ set global max_relay_log_size=8192-1; # mapped to 4096 ...@@ -43,7 +43,7 @@ set global max_relay_log_size=8192-1; # mapped to 4096
select @@global.max_relay_log_size; select @@global.max_relay_log_size;
start slave; start slave;
sync_with_master; sync_with_master;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
--echo # --echo #
--echo # Test 2 --echo # Test 2
...@@ -55,7 +55,7 @@ set global max_relay_log_size=(5*4096); ...@@ -55,7 +55,7 @@ set global max_relay_log_size=(5*4096);
query_vertical select @@global.max_relay_log_size; query_vertical select @@global.max_relay_log_size;
start slave; start slave;
sync_with_master; sync_with_master;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
--echo # --echo #
--echo # Test 3: max_relay_log_size = 0 --echo # Test 3: max_relay_log_size = 0
...@@ -67,7 +67,7 @@ set global max_relay_log_size=0; ...@@ -67,7 +67,7 @@ set global max_relay_log_size=0;
query_vertical select @@global.max_relay_log_size; query_vertical select @@global.max_relay_log_size;
start slave; start slave;
sync_with_master; sync_with_master;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
--echo # --echo #
--echo # Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions --echo # Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
...@@ -78,7 +78,7 @@ reset slave; ...@@ -78,7 +78,7 @@ reset slave;
# test of relay log rotation when the slave is stopped # test of relay log rotation when the slave is stopped
# (to make sure it does not crash). # (to make sure it does not crash).
flush logs; flush logs;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
--echo # --echo #
--echo # Test 5 --echo # Test 5
...@@ -96,7 +96,7 @@ create table t1 (a int); ...@@ -96,7 +96,7 @@ create table t1 (a int);
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
--echo # --echo #
--echo # Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated --echo # Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
...@@ -108,13 +108,12 @@ drop table t1; ...@@ -108,13 +108,12 @@ drop table t1;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
connection master; connection master;
# test that the absence of relay logs does not make a master crash # test that the absence of relay logs does not make a master crash
flush logs; flush logs;
-- replace_column 3 <Binlog_Ignore_DB> source include/show_master_status.inc;
query_vertical show master status;
# Restore max_binlog_size # Restore max_binlog_size
connection slave; connection slave;
......
mysql-test/extra/rpl_tests/rpl_reset_slave.test
View file @ 32a77ed6
...@@ -13,18 +13,18 @@ connection master; ...@@ -13,18 +13,18 @@ connection master;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
stop slave; stop slave;
change master to master_user='test'; change master to master_user='test';
source include/show_slave_status.inc; source include/show_slave_status2.inc;
reset slave; reset slave;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
start slave; start slave;
sync_with_master; sync_with_master;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
# test of crash with temp tables & RESET SLAVE # test of crash with temp tables & RESET SLAVE
# (test to see if RESET SLAVE clears temp tables in memory and disk) # (test to see if RESET SLAVE clears temp tables in memory and disk)
......
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
View file @ 32a77ed6
...@@ -122,7 +122,7 @@ INSERT INTO t1_nodef VALUES (1,2); ...@@ -122,7 +122,7 @@ INSERT INTO t1_nodef VALUES (1,2);
connection slave; connection slave;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # --replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -142,7 +142,7 @@ sync_slave_with_master; ...@@ -142,7 +142,7 @@ sync_slave_with_master;
--echo **** On Slave **** --echo **** On Slave ****
SELECT * FROM t2; SELECT * FROM t2;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # --replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
connection master; connection master;
...@@ -154,7 +154,7 @@ INSERT INTO t4 VALUES (4); ...@@ -154,7 +154,7 @@ INSERT INTO t4 VALUES (4);
connection slave; connection slave;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # --replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -168,7 +168,7 @@ INSERT INTO t5 VALUES (5,10,25); ...@@ -168,7 +168,7 @@ INSERT INTO t5 VALUES (5,10,25);
connection slave; connection slave;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # --replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -182,7 +182,7 @@ INSERT INTO t6 VALUES (6,12,36); ...@@ -182,7 +182,7 @@ INSERT INTO t6 VALUES (6,12,36);
connection slave; connection slave;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # --replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -191,7 +191,7 @@ connection master; ...@@ -191,7 +191,7 @@ connection master;
INSERT INTO t9 VALUES (6); INSERT INTO t9 VALUES (6);
sync_slave_with_master; sync_slave_with_master;
--replace_result $SLAVE_MYPORT SLAVE_PORT --replace_result $SLAVE_MYPORT SLAVE_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # --replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
# Testing some tables extra field that can be null and cannot be null # Testing some tables extra field that can be null and cannot be null
......
mysql-test/include/show_binary_logs.inc 0 → 100644
View file @ 32a77ed6
# show binary logs
# mask out the binlog position
-- replace_column 2 #
show binary logs;
mysql-test/include/show_master_logs.inc 0 → 100644
View file @ 32a77ed6
# show master logs
# mask out the binlog position
-- replace_column 2 #
query_vertical show master logs;
mysql-test/include/show_master_status.inc 0 → 100644
View file @ 32a77ed6
# show master status
# mask out the binlog position
-- replace_column 2 # 3 <Binlog_Do_DB> 4 <Binlog_Ignore_DB>
show master status;
mysql-test/include/show_slave_status2.inc 0 → 100644
View file @ 32a77ed6
# Include file to show the slave status, masking out some information
# that varies depending on where the test is executed.
# masked out log positions
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 #
query_vertical SHOW SLAVE STATUS;
mysql-test/suite/rpl/r/rpl_000015.result
View file @ 32a77ed6
reset master; reset master;
show master status; show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 106 master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
reset slave; reset slave;
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
change master to master_host='127.0.0.1'; change master to master_host='127.0.0.1';
...@@ -12,7 +12,7 @@ Master_User test ...@@ -12,7 +12,7 @@ Master_User test
Master_Port 3306 Master_Port 3306
Connect_Retry 7 Connect_Retry 7
Master_Log_File Master_Log_File
Read_Master_Log_Pos 4 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File Relay_Master_Log_File
...@@ -27,7 +27,7 @@ Replicate_Wild_Ignore_Table ...@@ -27,7 +27,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 0 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -53,7 +53,7 @@ Master_User root ...@@ -53,7 +53,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 7 Connect_Retry 7
Master_Log_File Master_Log_File
Read_Master_Log_Pos 4 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File Relay_Master_Log_File
...@@ -68,7 +68,7 @@ Replicate_Wild_Ignore_Table ...@@ -68,7 +68,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 0 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -93,7 +93,7 @@ Master_User root ...@@ -93,7 +93,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 7 Connect_Retry 7
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 106 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -108,7 +108,7 @@ Replicate_Wild_Ignore_Table ...@@ -108,7 +108,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 106 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
......
mysql-test/suite/rpl/r/rpl_change_master.result
View file @ 32a77ed6
...@@ -33,7 +33,7 @@ Replicate_Wild_Ignore_Table ...@@ -33,7 +33,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 191 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -73,7 +73,7 @@ Replicate_Wild_Ignore_Table ...@@ -73,7 +73,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 191 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
......
mysql-test/suite/rpl/r/rpl_create_database.result
View file @ 32a77ed6
...@@ -20,21 +20,17 @@ INSERT INTO t2 VALUES(2); ...@@ -20,21 +20,17 @@ INSERT INTO t2 VALUES(2);
ALTER DATABASE mysqltest_sisyfos CHARACTER SET latin1; ALTER DATABASE mysqltest_sisyfos CHARACTER SET latin1;
USE mysqltest_sisyfos; USE mysqltest_sisyfos;
ALTER DATABASE mysqltest_bob CHARACTER SET latin1; ALTER DATABASE mysqltest_bob CHARACTER SET latin1;
SHOW DATABASES; SHOW DATABASES LIKE 'mysql%';
Database Database (mysql%)
information_schema
mysql mysql
mysqltest_bob mysqltest_bob
mysqltest_prometheus mysqltest_prometheus
mysqltest_sisyfos mysqltest_sisyfos
test SHOW DATABASES LIKE 'mysql%';
SHOW DATABASES; Database (mysql%)
Database
information_schema
mysql mysql
mysqltest_prometheus mysqltest_prometheus
mysqltest_sisyfos mysqltest_sisyfos
test
DROP DATABASE IF EXISTS mysqltest_sisyfos; DROP DATABASE IF EXISTS mysqltest_sisyfos;
USE mysqltest_prometheus; USE mysqltest_prometheus;
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
...@@ -42,21 +38,17 @@ INSERT INTO t1 VALUES (1); ...@@ -42,21 +38,17 @@ INSERT INTO t1 VALUES (1);
CREATE DATABASE mysqltest_sisyfos; CREATE DATABASE mysqltest_sisyfos;
USE mysqltest_sisyfos; USE mysqltest_sisyfos;
CREATE TABLE t2 (a INT); CREATE TABLE t2 (a INT);
SHOW DATABASES; SHOW DATABASES LIKE 'mysql%';
Database Database (mysql%)
information_schema
mysql mysql
mysqltest_bob mysqltest_bob
mysqltest_prometheus mysqltest_prometheus
mysqltest_sisyfos mysqltest_sisyfos
test SHOW DATABASES LIKE 'mysql%';
SHOW DATABASES; Database (mysql%)
Database
information_schema
mysql mysql
mysqltest_prometheus mysqltest_prometheus
mysqltest_sisyfos mysqltest_sisyfos
test
USE mysqltest_prometheus; USE mysqltest_prometheus;
SHOW TABLES; SHOW TABLES;
Tables_in_mysqltest_prometheus Tables_in_mysqltest_prometheus
......
mysql-test/suite/rpl/r/rpl_grant.result
View file @ 32a77ed6
...@@ -7,40 +7,40 @@ start slave; ...@@ -7,40 +7,40 @@ start slave;
**** On Master **** **** On Master ****
CREATE USER dummy@localhost; CREATE USER dummy@localhost;
CREATE USER dummy1@localhost, dummy2@localhost; CREATE USER dummy1@localhost, dummy2@localhost;
SELECT user, host FROM mysql.user WHERE user != 'root'; SELECT user, host FROM mysql.user WHERE user like 'dummy%';
user host user host
dummy localhost dummy localhost
dummy1 localhost dummy1 localhost
dummy2 localhost dummy2 localhost
SELECT COUNT(*) FROM mysql.user; SELECT COUNT(*) FROM mysql.user WHERE user like 'dummy%';
COUNT(*) COUNT(*)
6 3
**** On Slave **** **** On Slave ****
SELECT user,host FROM mysql.user WHERE user != 'root'; SELECT user,host FROM mysql.user WHERE user like 'dummy%';
user host user host
dummy localhost dummy localhost
dummy1 localhost dummy1 localhost
dummy2 localhost dummy2 localhost
SELECT COUNT(*) FROM mysql.user; SELECT COUNT(*) FROM mysql.user WHERE user like 'dummy%';
COUNT(*) COUNT(*)
6 3
**** On Master **** **** On Master ****
DROP USER nonexisting@localhost; DROP USER nonexisting@localhost;
ERROR HY000: Operation DROP USER failed for 'nonexisting'@'localhost' ERROR HY000: Operation DROP USER failed for 'nonexisting'@'localhost'
DROP USER nonexisting@localhost, dummy@localhost; DROP USER nonexisting@localhost, dummy@localhost;
ERROR HY000: Operation DROP USER failed for 'nonexisting'@'localhost' ERROR HY000: Operation DROP USER failed for 'nonexisting'@'localhost'
DROP USER dummy1@localhost, dummy2@localhost; DROP USER dummy1@localhost, dummy2@localhost;
SELECT user, host FROM mysql.user WHERE user != 'root'; SELECT user, host FROM mysql.user WHERE user like 'dummy%';
user host user host
SELECT COUNT(*) FROM mysql.user; SELECT COUNT(*) FROM mysql.user WHERE user like 'dummy%';
COUNT(*) COUNT(*)
3 0
**** On Slave **** **** On Slave ****
SELECT user,host FROM mysql.user WHERE user != 'root'; SELECT user,host FROM mysql.user WHERE user like 'dummy%';
user host user host
SELECT COUNT(*) FROM mysql.user; SELECT COUNT(*) FROM mysql.user WHERE user like 'dummy%';
COUNT(*) COUNT(*)
3 0
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
Slave_IO_State # Slave_IO_State #
Master_Host 127.0.0.1 Master_Host 127.0.0.1
...@@ -48,7 +48,7 @@ Master_User root ...@@ -48,7 +48,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 617 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -57,13 +57,13 @@ Slave_SQL_Running Yes ...@@ -57,13 +57,13 @@ Slave_SQL_Running Yes
Replicate_Do_DB Replicate_Do_DB
Replicate_Ignore_DB Replicate_Ignore_DB
Replicate_Do_Table Replicate_Do_Table
Replicate_Ignore_Table Replicate_Ignore_Table #
Replicate_Wild_Do_Table Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 617 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -76,7 +76,7 @@ Master_SSL_Cipher ...@@ -76,7 +76,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno #
Last_IO_Error Last_IO_Error #
Last_SQL_Errno 0 Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
mysql-test/suite/rpl/r/rpl_init_slave.result
View file @ 32a77ed6
...@@ -4,6 +4,7 @@ reset master; ...@@ -4,6 +4,7 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
set global max_connections=151;
show variables like 'init_slave'; show variables like 'init_slave';
Variable_name Value Variable_name Value
init_slave set global max_connections=500 init_slave set global max_connections=500
......
mysql-test/suite/rpl/r/rpl_load_from_master.result
View file @ 32a77ed6
...@@ -30,13 +30,11 @@ drop database mysqltest2; ...@@ -30,13 +30,11 @@ drop database mysqltest2;
set sql_log_bin = 0; set sql_log_bin = 0;
create database mysqltest2; create database mysqltest2;
create database mysqltest; create database mysqltest;
show databases; show databases like 'mysql%';
Database Database (mysql%)
information_schema
mysql mysql
mysqltest mysqltest
mysqltest2 mysqltest2
test
create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM; create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM;
create table mysqltest2.t2(n int, s text)ENGINE=MyISAM; create table mysqltest2.t2(n int, s text)ENGINE=MyISAM;
insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three'); insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three');
...@@ -47,11 +45,9 @@ insert into mysqltest.t1 values (1, 'one test'), (2, 'two test'), (3, 'three tes ...@@ -47,11 +45,9 @@ insert into mysqltest.t1 values (1, 'one test'), (2, 'two test'), (3, 'three tes
insert into mysqltest.t2 values (11, 'eleven test'), (12, 'twelve test'), insert into mysqltest.t2 values (11, 'eleven test'), (12, 'twelve test'),
(13, 'thirteen test'); (13, 'thirteen test');
set sql_log_bin = 1; set sql_log_bin = 1;
show databases; show databases like 'mysql%';
Database Database (mysql%)
information_schema
mysql mysql
test
create database mysqltest2; create database mysqltest2;
create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM; create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest2.t1 values (1, 'original foo.t1'); insert into mysqltest2.t1 values (1, 'original foo.t1');
...@@ -66,14 +62,12 @@ insert into mysqltest.t1 values (1, 'original bar.t1'); ...@@ -66,14 +62,12 @@ insert into mysqltest.t1 values (1, 'original bar.t1');
create table mysqltest.t3(n int, s char(20))ENGINE=MyISAM; create table mysqltest.t3(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest.t3 values (1, 'original bar.t3'); insert into mysqltest.t3 values (1, 'original bar.t3');
load data from master; load data from master;
show databases; show databases like 'mysql%';
Database Database (mysql%)
information_schema
mysql mysql
mysqltest mysqltest
mysqltest2 mysqltest2
mysqltest3 mysqltest3
test
use mysqltest2; use mysqltest2;
show tables; show tables;
Tables_in_mysqltest2 Tables_in_mysqltest2
......
mysql-test/suite/rpl/r/rpl_log_pos.result
View file @ 32a77ed6
...@@ -6,7 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; ...@@ -6,7 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
show master status; show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 106 <Binlog_Ignore_DB> master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
stop slave; stop slave;
change master to master_log_pos=75; change master to master_log_pos=75;
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
...@@ -16,7 +16,7 @@ Master_User root ...@@ -16,7 +16,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 75 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -31,7 +31,7 @@ Replicate_Wild_Ignore_Table ...@@ -31,7 +31,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 75 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -91,12 +91,12 @@ Last_SQL_Errno 0 ...@@ -91,12 +91,12 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
show master status; show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 106 <Binlog_Ignore_DB> master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
create table if not exists t1 (n int); create table if not exists t1 (n int);
drop table if exists t1; drop table if exists t1;
create table t1 (n int); create table t1 (n int);
insert into t1 values (1),(2),(3); insert into t1 values (1),(2),(3);
change master to master_log_pos=106; change master to master_log_pos=4;
start slave; start slave;
select * from t1 ORDER BY n; select * from t1 ORDER BY n;
n n
......
mysql-test/suite/rpl/r/rpl_rotate_logs.result
View file @ 32a77ed6
...@@ -21,7 +21,7 @@ Master_User root ...@@ -21,7 +21,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 60 Connect_Retry 60
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 556 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -36,7 +36,7 @@ Replicate_Wild_Ignore_Table ...@@ -36,7 +36,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 556 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -63,9 +63,9 @@ insert into t2 values (34),(67),(123); ...@@ -63,9 +63,9 @@ insert into t2 values (34),(67),(123);
flush logs; flush logs;
show binary logs; show binary logs;
Log_name File_size Log_name File_size
master-bin.000001 600 master-bin.000001 #
master-bin.000002 371 master-bin.000002 #
master-bin.000003 106 master-bin.000003 #
create table t3 select * from temp_table; create table t3 select * from temp_table;
select * from t3; select * from t3;
a a
...@@ -78,21 +78,22 @@ set global sql_slave_skip_counter=1; ...@@ -78,21 +78,22 @@ set global sql_slave_skip_counter=1;
start slave; start slave;
purge master logs to 'master-bin.000002'; purge master logs to 'master-bin.000002';
show master logs; show master logs;
Log_name File_size Log_name master-bin.000002
master-bin.000002 371 File_size #
master-bin.000003 415 Log_name master-bin.000003
File_size #
purge binary logs to 'master-bin.000002'; purge binary logs to 'master-bin.000002';
show binary logs; show binary logs;
Log_name File_size Log_name File_size
master-bin.000002 371 master-bin.000002 #
master-bin.000003 415 master-bin.000003 #
select @time_for_purge:=DATE_ADD(UPDATE_TIME, INTERVAL 1 SECOND) select @time_for_purge:=DATE_ADD(UPDATE_TIME, INTERVAL 1 SECOND)
from information_schema.tables from information_schema.tables
where TABLE_SCHEMA="test" and TABLE_NAME="t2"; where TABLE_SCHEMA="test" and TABLE_NAME="t2";
purge master logs before (@time_for_purge); purge master logs before (@time_for_purge);
show binary logs; show binary logs;
Log_name File_size Log_name File_size
master-bin.000003 415 master-bin.000003 #
insert into t2 values (65); insert into t2 values (65);
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
Slave_IO_State # Slave_IO_State #
...@@ -101,7 +102,7 @@ Master_User root ...@@ -101,7 +102,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 60 Connect_Retry 60
Master_Log_File master-bin.000003 Master_Log_File master-bin.000003
Read_Master_Log_Pos 504 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000003 Relay_Master_Log_File master-bin.000003
...@@ -116,7 +117,7 @@ Replicate_Wild_Ignore_Table ...@@ -116,7 +117,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 504 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -149,12 +150,12 @@ count(*) ...@@ -149,12 +150,12 @@ count(*)
create table t4 select * from temp_table; create table t4 select * from temp_table;
show binary logs; show binary logs;
Log_name File_size Log_name File_size
master-bin.000003 4193 master-bin.000003 #
master-bin.000004 4198 master-bin.000004 #
master-bin.000005 2040 master-bin.000005 #
show master status; show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000005 2040 master-bin.000005 # <Binlog_Do_DB> <Binlog_Ignore_DB>
select * from t4; select * from t4;
a a
testing temporary tables part 2 testing temporary tables part 2
...@@ -165,7 +166,7 @@ Master_User root ...@@ -165,7 +166,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 60 Connect_Retry 60
Master_Log_File master-bin.000005 Master_Log_File master-bin.000005
Read_Master_Log_Pos 2040 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000005 Relay_Master_Log_File master-bin.000005
...@@ -180,7 +181,7 @@ Replicate_Wild_Ignore_Table ...@@ -180,7 +181,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 2040 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
......
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
View file @ 32a77ed6
...@@ -30,7 +30,7 @@ Master_User root ...@@ -30,7 +30,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 60268 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -45,7 +45,7 @@ Replicate_Wild_Ignore_Table ...@@ -45,7 +45,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 60268 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -78,7 +78,7 @@ Master_User root ...@@ -78,7 +78,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 60268 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -93,7 +93,7 @@ Replicate_Wild_Ignore_Table ...@@ -93,7 +93,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 60268 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -126,7 +126,7 @@ Master_User root ...@@ -126,7 +126,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 60268 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -141,7 +141,7 @@ Replicate_Wild_Ignore_Table ...@@ -141,7 +141,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 60268 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -171,7 +171,7 @@ Master_User root ...@@ -171,7 +171,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File Master_Log_File
Read_Master_Log_Pos 4 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File Relay_Master_Log_File
...@@ -186,7 +186,7 @@ Replicate_Wild_Ignore_Table ...@@ -186,7 +186,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 0 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -217,7 +217,7 @@ Master_User root ...@@ -217,7 +217,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 60354 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -232,7 +232,7 @@ Replicate_Wild_Ignore_Table ...@@ -232,7 +232,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 60354 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -261,7 +261,7 @@ Master_User root ...@@ -261,7 +261,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 60430 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -276,7 +276,7 @@ Replicate_Wild_Ignore_Table ...@@ -276,7 +276,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 60430 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -295,10 +295,8 @@ Last_SQL_Errno 0 ...@@ -295,10 +295,8 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
flush logs; flush logs;
show master status; show master status;
File master-bin.000002 File Position Binlog_Do_DB Binlog_Ignore_DB
Position 106 master-bin.000002 # <Binlog_Do_DB> <Binlog_Ignore_DB>
Binlog_Do_DB <Binlog_Ignore_DB>
Binlog_Ignore_DB
set global max_binlog_size= @my_max_binlog_size; set global max_binlog_size= @my_max_binlog_size;
# #
# End of 4.1 tests # End of 4.1 tests
......
mysql-test/suite/rpl/r/rpl_row_reset_slave.result
View file @ 32a77ed6
...@@ -11,7 +11,7 @@ Master_User root ...@@ -11,7 +11,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 106 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -26,7 +26,7 @@ Replicate_Wild_Ignore_Table ...@@ -26,7 +26,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 106 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -52,7 +52,7 @@ Master_User test ...@@ -52,7 +52,7 @@ Master_User test
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 106 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -67,7 +67,7 @@ Replicate_Wild_Ignore_Table ...@@ -67,7 +67,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 106 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -92,7 +92,7 @@ Master_User root ...@@ -92,7 +92,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File Master_Log_File
Read_Master_Log_Pos 4 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File Relay_Master_Log_File
...@@ -107,7 +107,7 @@ Replicate_Wild_Ignore_Table ...@@ -107,7 +107,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 0 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -132,7 +132,7 @@ Master_User root ...@@ -132,7 +132,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 106 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -147,7 +147,7 @@ Replicate_Wild_Ignore_Table ...@@ -147,7 +147,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 106 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
......
mysql-test/suite/rpl/r/rpl_skip_error.result
View file @ 32a77ed6
...@@ -29,7 +29,43 @@ select * from t1; ...@@ -29,7 +29,43 @@ select * from t1;
a a
1 1
2 2
show slave status; SHOW SLAVE STATUS;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Slave_IO_State #
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 851 # # master-bin.000001 Yes Yes 0 0 851 # None 0 No # No 0 0 Master_Host 127.0.0.1
Master_User root
Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000001
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes
Slave_SQL_Running Yes
Replicate_Do_DB
Replicate_Ignore_DB
Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Error
Skip_Counter 0
Exec_Master_Log_Pos #
Relay_Log_Space #
Until_Condition None
Until_Log_File
Until_Log_Pos 0
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
drop table t1; drop table t1;
mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
View file @ 32a77ed6
...@@ -28,7 +28,7 @@ Master_User root ...@@ -28,7 +28,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 72960 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -43,7 +43,7 @@ Replicate_Wild_Ignore_Table ...@@ -43,7 +43,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 72960 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -76,7 +76,7 @@ Master_User root ...@@ -76,7 +76,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 72960 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -91,7 +91,7 @@ Replicate_Wild_Ignore_Table ...@@ -91,7 +91,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 72960 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -124,7 +124,7 @@ Master_User root ...@@ -124,7 +124,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 72960 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -139,7 +139,7 @@ Replicate_Wild_Ignore_Table ...@@ -139,7 +139,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 72960 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -169,7 +169,7 @@ Master_User root ...@@ -169,7 +169,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File Master_Log_File
Read_Master_Log_Pos 4 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File Relay_Master_Log_File
...@@ -184,7 +184,7 @@ Replicate_Wild_Ignore_Table ...@@ -184,7 +184,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 0 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -215,7 +215,7 @@ Master_User root ...@@ -215,7 +215,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 73046 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -230,7 +230,7 @@ Replicate_Wild_Ignore_Table ...@@ -230,7 +230,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 73046 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -259,7 +259,7 @@ Master_User root ...@@ -259,7 +259,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 73122 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -274,7 +274,7 @@ Replicate_Wild_Ignore_Table ...@@ -274,7 +274,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 73122 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -293,10 +293,8 @@ Last_SQL_Errno 0 ...@@ -293,10 +293,8 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
flush logs; flush logs;
show master status; show master status;
File master-bin.000002 File Position Binlog_Do_DB Binlog_Ignore_DB
Position 106 master-bin.000002 # <Binlog_Do_DB> <Binlog_Ignore_DB>
Binlog_Do_DB <Binlog_Ignore_DB>
Binlog_Ignore_DB
set global max_binlog_size= @my_max_binlog_size; set global max_binlog_size= @my_max_binlog_size;
# #
# End of 4.1 tests # End of 4.1 tests
......
mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
View file @ 32a77ed6
...@@ -11,7 +11,7 @@ Master_User root ...@@ -11,7 +11,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 106 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -26,7 +26,7 @@ Replicate_Wild_Ignore_Table ...@@ -26,7 +26,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 106 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -52,7 +52,7 @@ Master_User test ...@@ -52,7 +52,7 @@ Master_User test
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 106 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -67,7 +67,7 @@ Replicate_Wild_Ignore_Table ...@@ -67,7 +67,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 106 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -92,7 +92,7 @@ Master_User root ...@@ -92,7 +92,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File Master_Log_File
Read_Master_Log_Pos 4 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File Relay_Master_Log_File
...@@ -107,7 +107,7 @@ Replicate_Wild_Ignore_Table ...@@ -107,7 +107,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 0 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
...@@ -132,7 +132,7 @@ Master_User root ...@@ -132,7 +132,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 106 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -147,7 +147,7 @@ Replicate_Wild_Ignore_Table ...@@ -147,7 +147,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 106 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
......
mysql-test/suite/rpl/r/rpl_stm_until.result
View file @ 32a77ed6
...@@ -26,7 +26,7 @@ Master_User root ...@@ -26,7 +26,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 784 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -41,7 +41,7 @@ Replicate_Wild_Ignore_Table ...@@ -41,7 +41,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 327 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition Master Until_Condition Master
Until_Log_File master-bin.000001 Until_Log_File master-bin.000001
...@@ -72,7 +72,7 @@ Master_User root ...@@ -72,7 +72,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 784 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -87,7 +87,7 @@ Replicate_Wild_Ignore_Table ...@@ -87,7 +87,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 327 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition Master Until_Condition Master
Until_Log_File master-no-such-bin.000001 Until_Log_File master-no-such-bin.000001
...@@ -116,7 +116,7 @@ Master_User root ...@@ -116,7 +116,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 784 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -131,7 +131,7 @@ Replicate_Wild_Ignore_Table ...@@ -131,7 +131,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 616 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition Relay Until_Condition Relay
Until_Log_File slave-relay-bin.000004 Until_Log_File slave-relay-bin.000004
...@@ -158,7 +158,7 @@ Master_User root ...@@ -158,7 +158,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 784 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -173,7 +173,7 @@ Replicate_Wild_Ignore_Table ...@@ -173,7 +173,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 784 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition Master Until_Condition Master
Until_Log_File master-bin.000001 Until_Log_File master-bin.000001
......
mysql-test/suite/rpl/r/rpl_temporary_errors.result
View file @ 32a77ed6
...@@ -46,7 +46,7 @@ Master_User root ...@@ -46,7 +46,7 @@ Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 408 Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
...@@ -61,7 +61,7 @@ Replicate_Wild_Ignore_Table ...@@ -61,7 +61,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 408 Exec_Master_Log_Pos #
Relay_Log_Space # Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
......
mysql-test/suite/rpl/t/rpl_000015.test
View file @ 32a77ed6
...@@ -9,22 +9,22 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); ...@@ -9,22 +9,22 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK); connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
connection master; connection master;
reset master; reset master;
show master status; source include/show_master_status.inc;
save_master_pos; save_master_pos;
connection slave; connection slave;
reset slave; reset slave;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
change master to master_host='127.0.0.1'; change master to master_host='127.0.0.1';
# The following needs to be cleaned up when change master is fixed # The following needs to be cleaned up when change master is fixed
source include/show_slave_status.inc; source include/show_slave_status2.inc;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
eval change master to master_host='127.0.0.1',master_user='root', eval change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=$MASTER_MYPORT; master_password='',master_port=$MASTER_MYPORT;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
start slave; start slave;
sync_with_master; sync_with_master;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
connection master; connection master;
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
......
mysql-test/suite/rpl/t/rpl_change_master.test
View file @ 32a77ed6
...@@ -18,13 +18,9 @@ save_master_pos; ...@@ -18,13 +18,9 @@ save_master_pos;
connection slave; connection slave;
--real_sleep 3 # wait for I/O thread to have read updates --real_sleep 3 # wait for I/O thread to have read updates
stop slave; stop slave;
--replace_result $MASTER_MYPORT MASTER_PORT source include/show_slave_status2.inc;
--replace_column 1 # 7 # 8 # 9 # 16 # 23 # 33 # 35 # 36 #
query_vertical SHOW SLAVE STATUS;
change master to master_user='root'; change master to master_user='root';
--replace_result $MASTER_MYPORT MASTER_PORT source include/show_slave_status2.inc;
--replace_column 1 # 7 # 8 # 9 # 16 # 23 # 33 # 35 # 36 #
query_vertical SHOW SLAVE STATUS;
start slave; start slave;
sync_with_master; sync_with_master;
select * from t1; select * from t1;
......
mysql-test/suite/rpl/t/rpl_colSize.test
View file @ 32a77ed6
...@@ -147,12 +147,14 @@ INSERT INTO t1 VALUES ("This is a test of col a.", ...@@ -147,12 +147,14 @@ INSERT INTO t1 VALUES ("This is a test of col a.",
"This is a test of the large col c.", "This is a test of the large col c.",
"Col d"); "Col d");
SELECT * FROM t1; SELECT * FROM t1;
--replace_result default DEFAULT
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
sync_slave_with_master slave; sync_slave_with_master slave;
--echo Insert some values and select them on slave --echo Insert some values and select them on slave
SELECT * FROM t1; SELECT * FROM t1;
--replace_result default DEFAULT
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
...@@ -200,12 +202,14 @@ INSERT INTO t1 VALUES ( ...@@ -200,12 +202,14 @@ INSERT INTO t1 VALUES (
); );
SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1; SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1;
--replace_result default DEFAULT
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
sync_slave_with_master slave; sync_slave_with_master slave;
--echo Insert some values and select them on master --echo Insert some values and select them on master
SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1; SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1;
--replace_result default DEFAULT
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
--echo *** Cleanup *** --echo *** Cleanup ***
......
mysql-test/suite/rpl/t/rpl_create_database.test
View file @ 32a77ed6
...@@ -42,9 +42,9 @@ USE mysqltest_sisyfos; ...@@ -42,9 +42,9 @@ USE mysqltest_sisyfos;
# The following should *not* be replicated # The following should *not* be replicated
ALTER DATABASE mysqltest_bob CHARACTER SET latin1; ALTER DATABASE mysqltest_bob CHARACTER SET latin1;
SHOW DATABASES; SHOW DATABASES LIKE 'mysql%';
sync_slave_with_master; sync_slave_with_master;
SHOW DATABASES; SHOW DATABASES LIKE 'mysql%';
connection master; connection master;
DROP DATABASE IF EXISTS mysqltest_sisyfos; DROP DATABASE IF EXISTS mysqltest_sisyfos;
...@@ -55,9 +55,9 @@ CREATE DATABASE mysqltest_sisyfos; ...@@ -55,9 +55,9 @@ CREATE DATABASE mysqltest_sisyfos;
USE mysqltest_sisyfos; USE mysqltest_sisyfos;
CREATE TABLE t2 (a INT); CREATE TABLE t2 (a INT);
let $VERSION=`select version()`; let $VERSION=`select version()`;
SHOW DATABASES; SHOW DATABASES LIKE 'mysql%';
sync_slave_with_master; sync_slave_with_master;
SHOW DATABASES; SHOW DATABASES LIKE 'mysql%';
USE mysqltest_prometheus; USE mysqltest_prometheus;
SHOW TABLES; SHOW TABLES;
USE mysqltest_sisyfos; USE mysqltest_sisyfos;
......
mysql-test/suite/rpl/t/rpl_grant.test
View file @ 32a77ed6
...@@ -9,12 +9,12 @@ connection master; ...@@ -9,12 +9,12 @@ connection master;
CREATE USER dummy@localhost; CREATE USER dummy@localhost;
CREATE USER dummy1@localhost, dummy2@localhost; CREATE USER dummy1@localhost, dummy2@localhost;
SELECT user, host FROM mysql.user WHERE user != 'root'; # root host non-determ SELECT user, host FROM mysql.user WHERE user like 'dummy%';
SELECT COUNT(*) FROM mysql.user; SELECT COUNT(*) FROM mysql.user WHERE user like 'dummy%';
sync_slave_with_master; sync_slave_with_master;
--echo **** On Slave **** --echo **** On Slave ****
SELECT user,host FROM mysql.user WHERE user != 'root'; # root host non-determ SELECT user,host FROM mysql.user WHERE user like 'dummy%';
SELECT COUNT(*) FROM mysql.user; SELECT COUNT(*) FROM mysql.user WHERE user like 'dummy%';
--echo **** On Master **** --echo **** On Master ****
connection master; connection master;
...@@ -30,13 +30,11 @@ DROP USER nonexisting@localhost, dummy@localhost; ...@@ -30,13 +30,11 @@ DROP USER nonexisting@localhost, dummy@localhost;
# All users exist # All users exist
DROP USER dummy1@localhost, dummy2@localhost; DROP USER dummy1@localhost, dummy2@localhost;
SELECT user, host FROM mysql.user WHERE user != 'root'; # root host non-determ SELECT user, host FROM mysql.user WHERE user like 'dummy%';
SELECT COUNT(*) FROM mysql.user; SELECT COUNT(*) FROM mysql.user WHERE user like 'dummy%';
sync_slave_with_master; sync_slave_with_master;
--echo **** On Slave **** --echo **** On Slave ****
SELECT user,host FROM mysql.user WHERE user != 'root'; # root host non-determ SELECT user,host FROM mysql.user WHERE user like 'dummy%';
SELECT COUNT(*) FROM mysql.user; SELECT COUNT(*) FROM mysql.user WHERE user like 'dummy%';
--replace_result $MASTER_MYPORT MASTER_PORT source include/show_slave_status2.inc;
--replace_column 1 # 8 # 9 # 23 # 33 #
query_vertical SHOW SLAVE STATUS;
mysql-test/suite/rpl/t/rpl_init_slave.test
View file @ 32a77ed6
...@@ -4,6 +4,8 @@ source include/master-slave.inc; ...@@ -4,6 +4,8 @@ source include/master-slave.inc;
# Test of init_slave variable # Test of init_slave variable
# #
set global max_connections=151;
save_master_pos; save_master_pos;
connection slave; connection slave;
show variables like 'init_slave'; show variables like 'init_slave';
......
mysql-test/suite/rpl/t/rpl_load_from_master.test
View file @ 32a77ed6
...@@ -54,7 +54,7 @@ connection master; ...@@ -54,7 +54,7 @@ connection master;
set sql_log_bin = 0; set sql_log_bin = 0;
create database mysqltest2; create database mysqltest2;
create database mysqltest; create database mysqltest;
show databases; show databases like 'mysql%';
create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM; create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM;
create table mysqltest2.t2(n int, s text)ENGINE=MyISAM; create table mysqltest2.t2(n int, s text)ENGINE=MyISAM;
insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three'); insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three');
...@@ -71,7 +71,7 @@ connection slave; ...@@ -71,7 +71,7 @@ connection slave;
sync_with_master; sync_with_master;
# This should show that the slave is empty at this point # This should show that the slave is empty at this point
show databases; show databases like 'mysql%';
# Create mysqltest2 and mysqltest3 on slave; we expect that LOAD DATA FROM # Create mysqltest2 and mysqltest3 on slave; we expect that LOAD DATA FROM
# MASTER will neither touch database mysqltest nor mysqltest3 # MASTER will neither touch database mysqltest nor mysqltest3
create database mysqltest2; create database mysqltest2;
...@@ -95,7 +95,7 @@ insert into mysqltest.t3 values (1, 'original bar.t3'); ...@@ -95,7 +95,7 @@ insert into mysqltest.t3 values (1, 'original bar.t3');
load data from master; load data from master;
# Now let's check if we have the right tables and the right data in them # Now let's check if we have the right tables and the right data in them
show databases; show databases like 'mysql%';
use mysqltest2; use mysqltest2;
# LOAD DATA FROM MASTER uses only replicate_*_db rules to decide which # LOAD DATA FROM MASTER uses only replicate_*_db rules to decide which
......
mysql-test/suite/rpl/t/rpl_log_pos.test
View file @ 32a77ed6
...@@ -11,14 +11,13 @@ ...@@ -11,14 +11,13 @@
# Passes with rbr no problem, removed statement include [jbm] # Passes with rbr no problem, removed statement include [jbm]
source include/master-slave.inc; source include/master-slave.inc;
--replace_column 3 <Binlog_Ignore_DB> source include/show_master_status.inc;
show master status;
sync_slave_with_master; sync_slave_with_master;
stop slave; stop slave;
--source include/wait_for_slave_to_stop.inc --source include/wait_for_slave_to_stop.inc
change master to master_log_pos=75; change master to master_log_pos=75;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
start slave; start slave;
let $slave_param= Slave_SQL_Running; let $slave_param= Slave_SQL_Running;
let $slave_param_value= Yes; let $slave_param_value= Yes;
...@@ -31,15 +30,14 @@ stop slave; ...@@ -31,15 +30,14 @@ stop slave;
source include/show_slave_status.inc; source include/show_slave_status.inc;
connection master; connection master;
--replace_column 3 <Binlog_Ignore_DB> source include/show_master_status.inc;
show master status;
create table if not exists t1 (n int); create table if not exists t1 (n int);
drop table if exists t1; drop table if exists t1;
create table t1 (n int); create table t1 (n int);
insert into t1 values (1),(2),(3); insert into t1 values (1),(2),(3);
save_master_pos; save_master_pos;
connection slave; connection slave;
change master to master_log_pos=106; change master to master_log_pos=4;
start slave; start slave;
sync_with_master; sync_with_master;
select * from t1 ORDER BY n; select * from t1 ORDER BY n;
......
mysql-test/suite/rpl/t/rpl_rotate_logs.test
View file @ 32a77ed6
...@@ -65,14 +65,14 @@ insert into temp_table values ("testing temporary tables"); ...@@ -65,14 +65,14 @@ insert into temp_table values ("testing temporary tables");
create table t1 (s text); create table t1 (s text);
insert into t1 values('Could not break slave'),('Tried hard'); insert into t1 values('Could not break slave'),('Tried hard');
sync_slave_with_master; sync_slave_with_master;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
select * from t1; select * from t1;
connection master; connection master;
flush logs; flush logs;
create table t2(m int not null auto_increment primary key); create table t2(m int not null auto_increment primary key);
insert into t2 values (34),(67),(123); insert into t2 values (34),(67),(123);
flush logs; flush logs;
show binary logs; source include/show_binary_logs.inc;
create table t3 select * from temp_table; create table t3 select * from temp_table;
sync_slave_with_master; sync_slave_with_master;
...@@ -106,10 +106,10 @@ connection master; ...@@ -106,10 +106,10 @@ connection master;
sync_slave_with_master; sync_slave_with_master;
connection master; connection master;
purge master logs to 'master-bin.000002'; purge master logs to 'master-bin.000002';
show master logs; source include/show_master_logs.inc;
# we just tests if synonyms are accepted # we just tests if synonyms are accepted
purge binary logs to 'master-bin.000002'; purge binary logs to 'master-bin.000002';
show binary logs; source include/show_binary_logs.inc;
# Calculate time to use in "purge master logs before" by taking # Calculate time to use in "purge master logs before" by taking
# last modification time of t2 and adding 1 second # last modification time of t2 and adding 1 second
...@@ -122,10 +122,10 @@ select @time_for_purge:=DATE_ADD(UPDATE_TIME, INTERVAL 1 SECOND) ...@@ -122,10 +122,10 @@ select @time_for_purge:=DATE_ADD(UPDATE_TIME, INTERVAL 1 SECOND)
--enable_result_log --enable_result_log
purge master logs before (@time_for_purge); purge master logs before (@time_for_purge);
show binary logs; source include/show_binary_logs.inc;
insert into t2 values (65); insert into t2 values (65);
sync_slave_with_master; sync_slave_with_master;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
select * from t2; select * from t2;
# #
...@@ -148,14 +148,14 @@ while ($1) ...@@ -148,14 +148,14 @@ while ($1)
enable_query_log; enable_query_log;
select count(*) from t3 where n >= 4; select count(*) from t3 where n >= 4;
create table t4 select * from temp_table; create table t4 select * from temp_table;
show binary logs; source include/show_binary_logs.inc;
show master status; source include/show_master_status.inc;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
select * from t4; select * from t4;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
# because of concurrent insert, the table may not be up to date # because of concurrent insert, the table may not be up to date
# if we do not lock # if we do not lock
lock tables t3 read; lock tables t3 read;
......
mysql-test/suite/rpl/t/rpl_skip_error.test
View file @ 32a77ed6
...@@ -50,9 +50,7 @@ sync_slave_with_master; ...@@ -50,9 +50,7 @@ sync_slave_with_master;
connection slave; connection slave;
select @@server_id; select @@server_id;
select * from t1; select * from t1;
--replace_column 1 # 8 # 9 # 23 # 33 # source include/show_slave_status2.inc;
--replace_result $MASTER_MYPORT MASTER_PORT
show slave status;
connection master; connection master;
drop table t1; drop table t1;
sync_with_master; sync_with_master;
......
mysql-test/suite/rpl/t/rpl_stm_until.test
View file @ 32a77ed6
...@@ -31,20 +31,20 @@ start slave until master_log_file='master-bin.000001', master_log_pos=323; ...@@ -31,20 +31,20 @@ start slave until master_log_file='master-bin.000001', master_log_pos=323;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
# here table should be still not deleted # here table should be still not deleted
select * from t1; select * from t1;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
# this should fail right after start # this should fail right after start
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291; start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
# again this table should be still not deleted # again this table should be still not deleted
select * from t1; select * from t1;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
# try replicate all up to and not including the second insert to t2; # try replicate all up to and not including the second insert to t2;
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746; start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
select * from t2; select * from t2;
source include/show_slave_status.inc; source include/show_slave_status2.inc;
# clean up # clean up
start slave; start slave;
...@@ -61,7 +61,7 @@ start slave until master_log_file='master-bin.000001', master_log_pos=776; ...@@ -61,7 +61,7 @@ start slave until master_log_file='master-bin.000001', master_log_pos=776;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
# here the sql slave thread should be stopped # here the sql slave thread should be stopped
--replace_result bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 --replace_result bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004
source include/show_slave_status.inc; source include/show_slave_status2.inc;
#testing various error conditions #testing various error conditions
--error 1277 --error 1277
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7