Skip to content

M
MariaDB
Commit 458ced9f authored by unknown's avatar unknown
Browse files
Options

altered syntax from SLAVE START|STOP to START|STOP SLAVE 


mysql-test/mysql-test-run.sh:
  Added --rpl option which tests all t/rpl*.test tests.
parent 27d11e85
Show whitespace changes
Inline Side-by-side
Showing with 167 additions and 206 deletions
mysql-test/include/master-slave.inc
View file @ 458ced9f
...@@ -4,7 +4,7 @@ connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,); ...@@ -4,7 +4,7 @@ connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,); connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);
connection slave; connection slave;
--error 0,1199 --error 0,1199
!slave stop; !stop slave;
@r/slave-stopped.result show status like 'Slave_running'; @r/slave-stopped.result show status like 'Slave_running';
connection master; connection master;
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;
...@@ -13,7 +13,7 @@ connection slave; ...@@ -13,7 +13,7 @@ connection slave;
reset slave; reset slave;
# Clean up old test tables # Clean up old test tables
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;
slave start; start slave;
@r/slave-running.result show status like 'Slave_running'; @r/slave-running.result show status like 'Slave_running';
# Set the default connection to 'master' # Set the default connection to 'master'
......
mysql-test/mysql-test-run.sh
View file @ 458ced9f
...@@ -192,6 +192,7 @@ CHARACTER_SET=latin1 ...@@ -192,6 +192,7 @@ CHARACTER_SET=latin1
DBUSER="" DBUSER=""
START_WAIT_TIMEOUT=10 START_WAIT_TIMEOUT=10
STOP_WAIT_TIMEOUT=10 STOP_WAIT_TIMEOUT=10
TEST_REPLICATION=0
while test $# -gt 0; do while test $# -gt 0; do
case "$1" in case "$1" in
...@@ -265,6 +266,9 @@ while test $# -gt 0; do ...@@ -265,6 +266,9 @@ while test $# -gt 0; do
--user-test=*) --user-test=*)
USER_TEST=`$ECHO "$1" | $SED -e "s;--user-test=;;"` USER_TEST=`$ECHO "$1" | $SED -e "s;--user-test=;;"`
;; ;;
--rpl)
TEST_REPLICATION=1
;;
--mysqld=*) --mysqld=*)
TMP=`$ECHO "$1" | $SED -e "s;--mysqld=;;"` TMP=`$ECHO "$1" | $SED -e "s;--mysqld=;;"`
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $TMP" EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $TMP"
...@@ -1291,11 +1295,18 @@ if [ -z "$1" ] ; ...@@ -1291,11 +1295,18 @@ if [ -z "$1" ] ;
then then
if [ x$RECORD = x1 ]; then if [ x$RECORD = x1 ]; then
$ECHO "Will not run in record mode without a specific test case." $ECHO "Will not run in record mode without a specific test case."
else
if [ x$TEST_REPLICATION = x1 ]; then
for tf in $TESTDIR/rpl*.$TESTSUFFIX
do
run_testcase $tf
done
else else
for tf in $TESTDIR/*.$TESTSUFFIX for tf in $TESTDIR/*.$TESTSUFFIX
do do
run_testcase $tf run_testcase $tf
done done
fi
$RM -f $TIMEFILE # Remove for full test $RM -f $TIMEFILE # Remove for full test
fi fi
else else
......
mysql-test/r/rpl000001.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop table if exists t1,t2,t3; drop table if exists t1,t2,t3;
create table t1 (word char(20) not null); create table t1 (word char(20) not null);
load data infile '../../std_data/words.dat' into table t1; load data infile '../../std_data/words.dat' into table t1;
...@@ -30,9 +30,9 @@ abandoned ...@@ -30,9 +30,9 @@ abandoned
abandoning abandoning
abandonment abandonment
abandons abandons
slave stop; stop slave;
set password for root@"localhost" = password('foo'); set password for root@"localhost" = password('foo');
slave start; start slave;
set password for root@"localhost" = password(''); set password for root@"localhost" = password('');
create table t3(n int); create table t3(n int);
insert into t3 values(1),(2); insert into t3 values(1),(2);
...@@ -45,13 +45,13 @@ sum(length(word)) ...@@ -45,13 +45,13 @@ sum(length(word))
141 141
drop table t1,t3; drop table t1,t3;
reset master; reset master;
slave stop; stop slave;
reset slave; reset slave;
create table t1(n int); create table t1(n int);
select get_lock("hold_slave",10); select get_lock("hold_slave",10);
get_lock("hold_slave",10) get_lock("hold_slave",10)
1 1
slave start; start slave;
select release_lock("hold_slave"); select release_lock("hold_slave");
release_lock("hold_slave") release_lock("hold_slave")
1 1
...@@ -68,7 +68,7 @@ kill @id; ...@@ -68,7 +68,7 @@ kill @id;
drop table t2; drop table t2;
Server shutdown in progress Server shutdown in progress
set global sql_slave_skip_counter=1; set global sql_slave_skip_counter=1;
slave start; start slave;
select count(*) from t1; select count(*) from t1;
count(*) count(*)
5000 5000
......
mysql-test/r/rpl000002.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop table if exists t1; drop table if exists t1;
create table t1 (n int auto_increment primary key); create table t1 (n int auto_increment primary key);
set insert_id = 2000; set insert_id = 2000;
...@@ -17,7 +17,7 @@ show slave hosts; ...@@ -17,7 +17,7 @@ show slave hosts;
Server_id Host Port Rpl_recovery_rank Master_id Server_id Host Port Rpl_recovery_rank Master_id
2 127.0.0.1 9999 2 1 2 127.0.0.1 9999 2 1
drop table t1; drop table t1;
slave stop; stop slave;
drop table if exists t2; drop table if exists t2;
create table t2(id int auto_increment primary key, created datetime); create table t2(id int auto_increment primary key, created datetime);
set timestamp=12345; set timestamp=12345;
...@@ -25,7 +25,7 @@ insert into t2 set created=now(); ...@@ -25,7 +25,7 @@ insert into t2 set created=now();
select * from t2; select * from t2;
id created id created
1 1970-01-01 06:25:45 1 1970-01-01 06:25:45
slave start; start slave;
select * from t2; select * from t2;
id created id created
1 1970-01-01 06:25:45 1 1970-01-01 06:25:45
......
mysql-test/r/rpl000003.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop table if exists t1; drop table if exists t1;
create table t1(n int primary key); create table t1(n int primary key);
insert into t1 values (1),(2),(2); insert into t1 values (1),(2),(2);
......
mysql-test/r/rpl000004.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
set SQL_LOG_BIN=0; set SQL_LOG_BIN=0;
drop table if exists t1; drop table if exists t1;
create table t1 (word char(20) not null, index(word)); create table t1 (word char(20) not null, index(word));
......
mysql-test/r/rpl000005.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop table if exists t1; drop table if exists t1;
CREATE TABLE t1 (name varchar(64), age smallint(3)); CREATE TABLE t1 (name varchar(64), age smallint(3));
INSERT INTO t1 SET name='Andy', age=31; INSERT INTO t1 SET name='Andy', age=31;
......
mysql-test/r/rpl000006.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
set SQL_LOG_BIN=0,timestamp=200006; set SQL_LOG_BIN=0,timestamp=200006;
drop table if exists t1; drop table if exists t1;
create table t1(t timestamp not null,a char(1)); create table t1(t timestamp not null,a char(1));
......
mysql-test/r/rpl000007.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop table if exists foo; drop table if exists foo;
create table foo (n int); create table foo (n int);
insert into foo values(4); insert into foo values(4);
......
mysql-test/r/rpl000008.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
use test; use test;
drop table if exists foo; drop table if exists foo;
create table foo (n int); create table foo (n int);
......
mysql-test/r/rpl000009.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop database if exists foo; drop database if exists foo;
create database foo; create database foo;
drop database if exists bar; drop database if exists bar;
......
mysql-test/r/rpl000010.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop table if exists t1; drop table if exists t1;
drop table if exists t1; drop table if exists t1;
create table t1 (n int not null auto_increment primary key); create table t1 (n int not null auto_increment primary key);
......
mysql-test/r/rpl000011.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
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); insert into t1 values(1);
slave stop; stop slave;
slave start; start slave;
insert into t1 values(2); insert into t1 values(2);
select * from t1; select * from t1;
n n
......
mysql-test/r/rpl000012.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop table if exists t1,t2,t3; drop table if exists t1,t2,t3;
create table t2 (n int); create table t2 (n int);
create temporary table t1 (n int); create temporary table t1 (n int);
......
mysql-test/r/rpl000013.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop table if exists t2; drop table if exists t2;
create table t2(n int); create table t2(n int);
create temporary table t1 (n int); create temporary table t1 (n int);
......
mysql-test/r/rpl000015.result
View file @ 458ced9f
...@@ -14,7 +14,7 @@ master_password='',master_port=MASTER_PORT; ...@@ -14,7 +14,7 @@ master_password='',master_port=MASTER_PORT;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 7 4 slave-relay-bin.001 4 No No 0 0 0 4 127.0.0.1 root MASTER_PORT 7 4 slave-relay-bin.001 4 No No 0 0 0 4
slave start; start slave;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 7 master-bin.001 79 slave-relay-bin.001 120 master-bin.001 Yes Yes 0 0 79 120 127.0.0.1 root MASTER_PORT 7 master-bin.001 79 slave-relay-bin.001 120 master-bin.001 Yes Yes 0 0 79 120
......
mysql-test/r/rpl000017.result
View file @ 458ced9f
reset master; reset master;
grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab'; grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';
grant replication slave on *.* to replicate@127.0.0.1 identified by 'aaaaaaaaaaaaaaab'; grant replication slave on *.* to replicate@127.0.0.1 identified by 'aaaaaaaaaaaaaaab';
slave start; start slave;
drop table if exists t1; drop table if exists t1;
create table t1(n int); create table t1(n int);
insert into t1 values(24); insert into t1 values(24);
......
mysql-test/r/rpl000018.result
View file @ 458ced9f
reset slave; reset slave;
slave start; start slave;
show master logs; show master logs;
Log_name Log_name
master-bin.001 master-bin.001
......
mysql-test/r/rpl_alter.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop database if exists d1; drop database if exists d1;
create database d1; create database d1;
create table d1.t1 ( n int); create table d1.t1 ( n int);
......
mysql-test/r/rpl_empty_master_crash.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop table if exists t1; drop table if exists t1;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
......
mysql-test/r/rpl_failsafe.result
View file @ 458ced9f
slave stop; stop slave;
reset master; 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;
slave start; start slave;
show variables like 'rpl_recovery_rank'; show variables like 'rpl_recovery_rank';
Variable_name Value Variable_name Value
rpl_recovery_rank 1 rpl_recovery_rank 1
...@@ -17,14 +17,14 @@ rpl_recovery_rank 2 ...@@ -17,14 +17,14 @@ rpl_recovery_rank 2
show status like 'Rpl_status'; show status like 'Rpl_status';
Variable_name Value Variable_name Value
Rpl_status ACTIVE_SLAVE Rpl_status ACTIVE_SLAVE
slave start; start slave;
show variables like 'rpl_recovery_rank'; show variables like 'rpl_recovery_rank';
Variable_name Value Variable_name Value
rpl_recovery_rank 3 rpl_recovery_rank 3
show status like 'Rpl_status'; show status like 'Rpl_status';
Variable_name Value Variable_name Value
Rpl_status ACTIVE_SLAVE Rpl_status ACTIVE_SLAVE
slave start; start slave;
show variables like 'rpl_recovery_rank'; show variables like 'rpl_recovery_rank';
Variable_name Value Variable_name Value
rpl_recovery_rank 4 rpl_recovery_rank 4
......
mysql-test/r/rpl_flush_log_loop.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
change master to master_host='127.0.0.1',master_user='root', change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=MASTER_PORT; master_password='',master_port=MASTER_PORT;
slave start; start slave;
slave stop; stop slave;
change master to master_host='127.0.0.1',master_user='root', change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=SLAVE_PORT; master_password='',master_port=SLAVE_PORT;
slave start; start slave;
flush logs; flush logs;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
......
mysql-test/r/rpl_get_lock.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
create table t1(n int); create table t1(n int);
insert into t1 values(get_lock("lock",2)); insert into t1 values(get_lock("lock",2));
select get_lock("lock",2); select get_lock("lock",2);
......
mysql-test/r/rpl_log.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
slave stop; stop slave;
reset master; reset master;
reset slave; reset slave;
reset master; reset master;
...@@ -36,9 +36,9 @@ show binlog events from 79 limit 2,1; ...@@ -36,9 +36,9 @@ show binlog events from 79 limit 2,1;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 200 Query 1 200 use `test`; insert into t1 values (NULL) master-bin.001 200 Query 1 200 use `test`; insert into t1 values (NULL)
flush logs; flush logs;
slave start; start slave;
flush logs; flush logs;
slave stop; stop slave;
create table t1 (n int); create table t1 (n int);
insert into t1 values (1); insert into t1 values (1);
drop table t1; drop table t1;
...@@ -63,7 +63,7 @@ show master logs; ...@@ -63,7 +63,7 @@ show master logs;
Log_name Log_name
master-bin.001 master-bin.001
master-bin.002 master-bin.002
slave start; start slave;
show master logs; show master logs;
Log_name Log_name
slave-bin.001 slave-bin.001
......
mysql-test/r/rpl_log_pos.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; 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.001 79 master-bin.001 79
...@@ -11,17 +11,17 @@ show slave status; ...@@ -11,17 +11,17 @@ show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.001 79 slave-relay-bin.002 120 master-bin.001 Yes Yes 0 0 79 124 127.0.0.1 root MASTER_PORT 1 master-bin.001 79 slave-relay-bin.002 120 master-bin.001 Yes Yes 0 0 79 124
change master to master_log_pos=73; change master to master_log_pos=73;
slave stop; stop slave;
change master to master_log_pos=73; change master to master_log_pos=73;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.001 73 slave-relay-bin.001 4 master-bin.001 No No 0 0 73 4 127.0.0.1 root MASTER_PORT 1 master-bin.001 73 slave-relay-bin.001 4 master-bin.001 No No 0 0 73 4
slave start; start slave;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.001 73 slave-relay-bin.001 4 master-bin.001 No Yes 0 0 73 4 127.0.0.1 root MASTER_PORT 1 master-bin.001 73 slave-relay-bin.001 4 master-bin.001 No Yes 0 0 73 4
change master to master_log_pos=173; change master to master_log_pos=173;
slave start; start slave;
show slave status; show slave status;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.001 173 slave-relay-bin.001 4 master-bin.001 No Yes 0 0 173 4 127.0.0.1 root MASTER_PORT 1 master-bin.001 173 slave-relay-bin.001 4 master-bin.001 No Yes 0 0 173 4
...@@ -33,7 +33,7 @@ drop table if exists t1; ...@@ -33,7 +33,7 @@ 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=79; change master to master_log_pos=79;
slave start; start slave;
select * from t1; select * from t1;
n n
1 1
......
mysql-test/r/rpl_mystery22.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
create table t1(n int auto_increment primary key); create table t1(n int auto_increment primary key);
insert into t1 values (2); insert into t1 values (2);
insert into t1 values(NULL); insert into t1 values(NULL);
insert into t1 values(NULL); insert into t1 values(NULL);
delete from t1 where n = 2; delete from t1 where n = 2;
slave start; start slave;
slave stop; stop slave;
create table t2(n int); create table t2(n int);
drop table t2; drop table t2;
insert into t1 values(NULL); insert into t1 values(NULL);
slave start; start slave;
select * from t1; select * from t1;
n n
1 1
......
mysql-test/r/rpl_redirect.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
SHOW SLAVE HOSTS; SHOW SLAVE HOSTS;
......
mysql-test/r/rpl_rotate_logs.result
View file @ 458ced9f
slave start; start slave;
Could not initialize master info structure, check permisions on master.info Could not initialize master info structure, check permisions on master.info
slave start; start slave;
Could not initialize master info structure, check permisions on master.info Could not initialize master info structure, check permisions on master.info
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root'; change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
Could not initialize master info Could not initialize master info
reset slave; reset slave;
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root'; change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
reset master; reset master;
slave start; start slave;
drop table if exists t1, t2, t3, t4; drop table if exists t1, t2, t3, t4;
create temporary table temp_table (a char(80) not null); create temporary table temp_table (a char(80) not null);
insert into temp_table values ("testing temporary tables"); insert into temp_table values ("testing temporary tables");
...@@ -39,7 +39,7 @@ insert into t2 values(1234); ...@@ -39,7 +39,7 @@ insert into t2 values(1234);
set insert_id=1234; set insert_id=1234;
insert into t2 values(NULL); insert into t2 values(NULL);
set global sql_slave_skip_counter=1; set global sql_slave_skip_counter=1;
slave start; start slave;
purge master logs to 'master-bin.003'; purge master logs to 'master-bin.003';
show master logs; show master logs;
Log_name Log_name
......
mysql-test/r/rpl_skip_error.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
drop table if exists t1; drop table if exists t1;
create table t1 (n int not null primary key); create table t1 (n int not null primary key);
insert into t1 values (1); insert into t1 values (1);
......
mysql-test/r/rpl_sporadic_master.result
View file @ 458ced9f
slave stop; stop 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;
reset master; 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;
slave start; start slave;
create table t2(n int); create table t2(n int);
create table t1(n int not null auto_increment primary key); create table t1(n int not null auto_increment primary key);
insert into t1 values (NULL),(NULL); insert into t1 values (NULL),(NULL);
truncate table t1; truncate table t1;
insert into t1 values (4),(NULL); insert into t1 values (4),(NULL);
slave stop; stop slave;
slave start; start slave;
insert into t1 values (NULL),(NULL); insert into t1 values (NULL),(NULL);
flush logs; flush logs;
truncate table t1; truncate table t1;
......
mysql-test/t/rpl000001.test
View file @ 458ced9f
...@@ -12,11 +12,11 @@ select * from t1; ...@@ -12,11 +12,11 @@ select * from t1;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
slave stop; stop slave;
connection master; connection master;
set password for root@"localhost" = password('foo'); set password for root@"localhost" = password('foo');
connection slave; connection slave;
slave start; start slave;
connection master; connection master;
# #
# Give slave time to do at last one failed connect retry # Give slave time to do at last one failed connect retry
...@@ -43,7 +43,7 @@ sync_with_master; ...@@ -43,7 +43,7 @@ sync_with_master;
connection master; connection master;
reset master; reset master;
connection slave; connection slave;
slave stop; stop slave;
reset slave; reset slave;
connection master; connection master;
...@@ -62,7 +62,7 @@ enable_query_log; ...@@ -62,7 +62,7 @@ enable_query_log;
# Try to cause a large relay log lag on the slave # Try to cause a large relay log lag on the slave
connection slave; connection slave;
select get_lock("hold_slave",10); select get_lock("hold_slave",10);
slave start; start slave;
#hope this is long enough for I/O thread to fetch over 16K relay log data #hope this is long enough for I/O thread to fetch over 16K relay log data
sleep 3; sleep 3;
select release_lock("hold_slave"); select release_lock("hold_slave");
...@@ -100,7 +100,7 @@ wait_for_slave_to_stop; ...@@ -100,7 +100,7 @@ wait_for_slave_to_stop;
# show slave status; # show slave status;
set global sql_slave_skip_counter=1; set global sql_slave_skip_counter=1;
slave start; start slave;
select count(*) from t1; select count(*) from t1;
connection master1; connection master1;
drop table t1; drop table t1;
......
mysql-test/t/rpl000002.test
View file @ 458ced9f
...@@ -3,18 +3,14 @@ drop table if exists t1; ...@@ -3,18 +3,14 @@ drop table if exists t1;
create table t1 (n int auto_increment primary key); create table t1 (n int auto_increment primary key);
set insert_id = 2000; set insert_id = 2000;
insert into t1 values (NULL),(NULL),(NULL); insert into t1 values (NULL),(NULL),(NULL);
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
select * from t1; select * from t1;
connection master; connection master;
--replace_result $SLAVE_MYPORT 9999 --replace_result $SLAVE_MYPORT 9999
show slave hosts; show slave hosts;
drop table t1; drop table t1;
save_master_pos; sync_slave_with_master;
connection slave; stop slave;
sync_with_master;
slave stop;
connection master; connection master;
drop table if exists t2; drop table if exists t2;
create table t2(id int auto_increment primary key, created datetime); create table t2(id int auto_increment primary key, created datetime);
...@@ -23,11 +19,9 @@ insert into t2 set created=now(); ...@@ -23,11 +19,9 @@ insert into t2 set created=now();
select * from t2; select * from t2;
save_master_pos; save_master_pos;
connection slave; connection slave;
slave start; start slave;
sync_with_master; sync_with_master;
select * from t2; select * from t2;
connection master; connection master;
drop table t2; drop table t2;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
mysql-test/t/rpl000011.test
View file @ 458ced9f
...@@ -2,20 +2,14 @@ source include/master-slave.inc; ...@@ -2,20 +2,14 @@ source include/master-slave.inc;
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); insert into t1 values(1);
save_master_pos; sync_slave_with_master;
connection slave; stop slave;
sync_with_master; start slave;
slave stop;
slave start;
connection master; connection master;
insert into t1 values(2); insert into t1 values(2);
save_master_pos;
connection slave;
#let slave catch up #let slave catch up
sync_with_master; sync_slave_with_master;
select * from t1; select * from t1;
connection master; connection master;
drop table t1; drop table t1;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
mysql-test/t/rpl000015.test
View file @ 458ced9f
...@@ -18,7 +18,7 @@ eval change master to master_host='127.0.0.1',master_user='root', ...@@ -18,7 +18,7 @@ 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;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
show slave status; show slave status;
slave start; start slave;
sync_with_master; sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
show slave status; show slave status;
...@@ -26,12 +26,8 @@ connection master; ...@@ -26,12 +26,8 @@ connection master;
drop table if exists t1; drop table if exists t1;
create table t1 (n int); create table t1 (n int);
insert into t1 values (10),(45),(90); insert into t1 values (10),(45),(90);
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
select * from t1; select * from t1;
connection master; connection master;
drop table t1; drop table t1;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
mysql-test/t/rpl000017.test
View file @ 458ced9f
...@@ -5,17 +5,13 @@ reset master; ...@@ -5,17 +5,13 @@ reset master;
grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab'; grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';
grant replication slave on *.* to replicate@127.0.0.1 identified by 'aaaaaaaaaaaaaaab'; grant replication slave on *.* to replicate@127.0.0.1 identified by 'aaaaaaaaaaaaaaab';
connection slave; connection slave;
slave start; start slave;
connection master; connection master;
drop table if exists t1; drop table if exists t1;
create table t1(n int); create table t1(n int);
insert into t1 values(24); insert into t1 values(24);
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
select * from t1; select * from t1;
connection master; connection master;
drop table t1; drop table t1;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
mysql-test/t/rpl000018.test
View file @ 458ced9f
...@@ -10,18 +10,14 @@ server_stop master; ...@@ -10,18 +10,14 @@ server_stop master;
server_start master; server_start master;
connection slave; connection slave;
reset slave; reset slave;
slave start; start slave;
connection master; connection master;
show master logs; show master logs;
drop table if exists t1; drop table if exists t1;
create table t1(n int); create table t1(n int);
insert into t1 values (3351); insert into t1 values (3351);
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
select * from t1; select * from t1;
connection master; connection master;
drop table t1; drop table t1;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
mysql-test/t/rpl_failsafe.test
View file @ 458ced9f
...@@ -7,18 +7,16 @@ show variables like 'rpl_recovery_rank'; ...@@ -7,18 +7,16 @@ show variables like 'rpl_recovery_rank';
show status like 'Rpl_status'; show status like 'Rpl_status';
create table t1(n int); create table t1(n int);
drop table t1; drop table t1;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
show variables like 'rpl_recovery_rank'; show variables like 'rpl_recovery_rank';
show status like 'Rpl_status'; show status like 'Rpl_status';
connection slave_sec; connection slave_sec;
slave start; start slave;
sync_with_master; sync_with_master;
show variables like 'rpl_recovery_rank'; show variables like 'rpl_recovery_rank';
show status like 'Rpl_status'; show status like 'Rpl_status';
connection slave_ter; connection slave_ter;
slave start; start slave;
sync_with_master; sync_with_master;
show variables like 'rpl_recovery_rank'; show variables like 'rpl_recovery_rank';
show status like 'Rpl_status'; show status like 'Rpl_status';
mysql-test/t/rpl_flush_log_loop.test
View file @ 458ced9f
...@@ -7,13 +7,13 @@ connection slave; ...@@ -7,13 +7,13 @@ connection slave;
--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;
slave start; start slave;
connection master; connection master;
slave stop; stop slave;
--replace_result $SLAVE_MYPORT SLAVE_PORT --replace_result $SLAVE_MYPORT SLAVE_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=$SLAVE_MYPORT; master_password='',master_port=$SLAVE_MYPORT;
slave start; start slave;
flush logs; flush logs;
sleep 5; sleep 5;
--replace_result $SLAVE_MYPORT SLAVE_PORT --replace_result $SLAVE_MYPORT SLAVE_PORT
......
mysql-test/t/rpl_log.test
View file @ 458ced9f
...@@ -2,7 +2,7 @@ source include/master-slave.inc; ...@@ -2,7 +2,7 @@ source include/master-slave.inc;
#clean up slave binlogs #clean up slave binlogs
connection slave; connection slave;
slave stop; stop slave;
reset master; reset master;
reset slave; reset slave;
let $VERSION=`select version()`; let $VERSION=`select version()`;
...@@ -26,10 +26,10 @@ flush logs; ...@@ -26,10 +26,10 @@ flush logs;
save_master_pos; save_master_pos;
connection slave; connection slave;
slave start; start slave;
sync_with_master; sync_with_master;
flush logs; flush logs;
slave stop; stop slave;
connection master; connection master;
# Create some entries for second log # Create some entries for second log
...@@ -43,7 +43,7 @@ show binlog events in 'master-bin.002'; ...@@ -43,7 +43,7 @@ show binlog events in 'master-bin.002';
show master logs; show master logs;
save_master_pos; save_master_pos;
connection slave; connection slave;
slave start; start slave;
sync_with_master; sync_with_master;
show master logs; show master logs;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION
......
mysql-test/t/rpl_log_pos.test
View file @ 458ced9f
...@@ -3,25 +3,23 @@ ...@@ -3,25 +3,23 @@
# #
source include/master-slave.inc; source include/master-slave.inc;
show master status; show master status;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
show slave status; show slave status;
change master to master_log_pos=73; change master to master_log_pos=73;
sleep 5; sleep 5;
slave stop; stop slave;
change master to master_log_pos=73; change master to master_log_pos=73;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
show slave status; show slave status;
slave start; start slave;
sleep 5; sleep 5;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
show slave status; show slave status;
change master to master_log_pos=173; change master to master_log_pos=173;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
slave start; start slave;
sleep 2; sleep 2;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
show slave status; show slave status;
...@@ -34,11 +32,9 @@ insert into t1 values (1),(2),(3); ...@@ -34,11 +32,9 @@ insert into t1 values (1),(2),(3);
save_master_pos; save_master_pos;
connection slave; connection slave;
change master to master_log_pos=79; change master to master_log_pos=79;
slave start; start slave;
sync_with_master; sync_with_master;
select * from t1; select * from t1;
connection master; connection master;
drop table t1; drop table t1;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
mysql-test/t/rpl_mystery22.test
View file @ 458ced9f
...@@ -4,9 +4,7 @@ source include/master-slave.inc; ...@@ -4,9 +4,7 @@ source include/master-slave.inc;
# first, cause a duplicate key problem on the slave # first, cause a duplicate key problem on the slave
create table t1(n int auto_increment primary key); create table t1(n int auto_increment primary key);
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
insert into t1 values (2); insert into t1 values (2);
connection master; connection master;
insert into t1 values(NULL); insert into t1 values(NULL);
...@@ -16,11 +14,11 @@ connection slave; ...@@ -16,11 +14,11 @@ connection slave;
sleep 3; # there is no way around this sleep - we have to wait until sleep 3; # there is no way around this sleep - we have to wait until
# the slave tries to run the query, fails and aborts slave thread # the slave tries to run the query, fails and aborts slave thread
delete from t1 where n = 2; delete from t1 where n = 2;
slave start; start slave;
sync_with_master; sync_with_master;
#now the buggy slave would be confused on the offset but it can replicate #now the buggy slave would be confused on the offset but it can replicate
#in order to make it break, we need to stop/start the slave one more time #in order to make it break, we need to stop/start the slave one more time
slave stop; stop slave;
connection master; connection master;
# to be able to really confuse the slave, we need some non-auto-increment # to be able to really confuse the slave, we need some non-auto-increment
# events in the log # events in the log
...@@ -29,7 +27,7 @@ drop table t2; ...@@ -29,7 +27,7 @@ drop table t2;
insert into t1 values(NULL); insert into t1 values(NULL);
save_master_pos; save_master_pos;
connection slave; connection slave;
slave start; start slave;
#now the truth comes out - if the slave is buggy, it will never sync because #now the truth comes out - if the slave is buggy, it will never sync because
#the slave thread is not able to read events #the slave thread is not able to read events
sync_with_master; sync_with_master;
...@@ -37,7 +35,5 @@ select * from t1; ...@@ -37,7 +35,5 @@ select * from t1;
#clean up #clean up
connection master; connection master;
drop table t1; drop table t1;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
mysql-test/t/rpl_rotate_logs.test
View file @ 458ced9f
...@@ -15,10 +15,10 @@ system cat /dev/null > var/slave-data/master.info; ...@@ -15,10 +15,10 @@ system cat /dev/null > var/slave-data/master.info;
system chmod 000 var/slave-data/master.info; system chmod 000 var/slave-data/master.info;
connection slave; connection slave;
--error 1201 --error 1201
slave start; start slave;
system chmod 600 var/slave-data/master.info; system chmod 600 var/slave-data/master.info;
--error 1201 --error 1201
slave start; start slave;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
# Will get error 13 on Unix systems becasue file is not readable # Will get error 13 on Unix systems becasue file is not readable
!eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root'; !eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root';
...@@ -28,7 +28,7 @@ eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master ...@@ -28,7 +28,7 @@ eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master
connection master; connection master;
reset master; reset master;
connection slave; connection slave;
slave start; start slave;
connection master; connection master;
drop table if exists t1, t2, t3, t4; drop table if exists t1, t2, t3, t4;
...@@ -40,9 +40,7 @@ create temporary table temp_table (a char(80) not null); ...@@ -40,9 +40,7 @@ create temporary table temp_table (a char(80) not null);
insert into temp_table values ("testing temporary tables"); 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');
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
show slave status; show slave status;
select * from t1; select * from t1;
...@@ -55,9 +53,7 @@ flush logs; ...@@ -55,9 +53,7 @@ flush logs;
show master logs; show master logs;
create table t3 select * from temp_table; create table t3 select * from temp_table;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
select * from t3; select * from t3;
connection master; connection master;
...@@ -83,21 +79,17 @@ wait_for_slave_to_stop; ...@@ -83,21 +79,17 @@ wait_for_slave_to_stop;
#restart slave skipping one event #restart slave skipping one event
set global sql_slave_skip_counter=1; set global sql_slave_skip_counter=1;
slave start; start slave;
connection master; connection master;
save_master_pos;
#let slave catch up #let slave catch up
connection slave; sync_slave_with_master;
sync_with_master;
connection master; connection master;
purge master logs to 'master-bin.003'; purge master logs to 'master-bin.003';
show master logs; show master logs;
insert into t2 values (65); insert into t2 values (65);
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
show slave status; show slave status;
select * from t2; select * from t2;
...@@ -125,8 +117,8 @@ show master logs; ...@@ -125,8 +117,8 @@ show master logs;
show master status; show master status;
save_master_pos; save_master_pos;
connection slave; connection slave;
#slave stop; #stop slave;
#slave start; #start slave;
sync_with_master; sync_with_master;
select * from t4; select * from t4;
...@@ -140,6 +132,4 @@ unlock tables; ...@@ -140,6 +132,4 @@ unlock tables;
#clean up #clean up
connection master; connection master;
drop table if exists t1,t2,t3,t4; drop table if exists t1,t2,t3,t4;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
mysql-test/t/rpl_sporadic_master.test
View file @ 458ced9f
...@@ -9,22 +9,16 @@ insert into t1 values (NULL),(NULL); ...@@ -9,22 +9,16 @@ insert into t1 values (NULL),(NULL);
truncate table t1; truncate table t1;
# We have to use 4 in the following to make this test work with all table types # We have to use 4 in the following to make this test work with all table types
insert into t1 values (4),(NULL); insert into t1 values (4),(NULL);
save_master_pos; sync_slave_with_master;
connection slave; stop slave;
sync_with_master; start slave;
slave stop;
slave start;
connection master; connection master;
insert into t1 values (NULL),(NULL); insert into t1 values (NULL),(NULL);
flush logs; flush logs;
truncate table t1; truncate table t1;
insert into t1 values (10),(NULL),(NULL),(NULL),(NULL),(NULL); insert into t1 values (10),(NULL),(NULL),(NULL),(NULL),(NULL);
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
select * from t1; select * from t1;
connection master; connection master;
drop table t1,t2; drop table t1,t2;
save_master_pos; sync_slave_with_master;
connection slave;
sync_with_master;
sql/sql_yacc.yy
View file @ 458ced9f
...@@ -1413,14 +1413,14 @@ opt_to: ...@@ -1413,14 +1413,14 @@ opt_to:
| AS {}; | AS {};
slave: slave:
SLAVE START_SYM slave_thread_opts START_SYM SLAVE slave_thread_opts
{ {
LEX *lex=Lex; LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_START; lex->sql_command = SQLCOM_SLAVE_START;
lex->type = 0; lex->type = 0;
} }
| |
SLAVE STOP_SYM slave_thread_opts STOP_SYM SLAVE slave_thread_opts
{ {
LEX *lex=Lex; LEX *lex=Lex;
lex->sql_command = SQLCOM_SLAVE_STOP; lex->sql_command = SQLCOM_SLAVE_STOP;
......
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