database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

temporary modification of rpl_loaddata.test until 4.0 is merged in 4.1.

Browse Source 
This is to avoid a test failure, which is fixed in 4.0 in
ChangeSet@1.1455.34.1, 2003-06-10 23:29:49+02:00, guilhem@mysql.com
by making RESET SLAVE reset the error.
This commit is contained in:
guilhem@gbichot2
2003-07-23 16:48:45 +02:00
parent 29207651af
commit a97c926eb6
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/rpl_loaddata.result
View File

@ -24,7 +24,3 @@ drop table t2;
drop table t3; drop table t3;
create table t1(a int, b int, unique(b)); create table t1(a int, b int, unique(b));
insert into t1 values(1,10); insert into t1 values(1,10);
load data infile '../../std_data/rpl_loaddata.dat' into table t1;
show status like 'slave_running';
Variable_name Value
Slave_running OFF

25
mysql-test/t/rpl_loaddata.test
View File

@ -37,14 +37,21 @@ connection slave;
sync_with_master; sync_with_master;
insert into t1 values(1,10); insert into t1 values(1,10);
connection master;
load data infile '../../std_data/rpl_loaddata.dat' into table t1;
save_master_pos; # NOTE UNTIL MERGE 4.0 INTO 4.1
connection slave; # Below we generate an error, but this error shows up in SHOW SLAVE STATUS
# don't sync_with_master because the slave SQL thread should be stopped because # in the next test. In 4.0 this is fixed (RESET SLAVE resets the error), but it
# of the error so MASTER_POS_WAIT() will not return; just sleep and hope the # has not been merged into 4.1 yet. So for the moment, I comment all lines
# slave SQL thread will have had time to stop. # below, to not generate the error, so that the test suite passes.
# When you do the 4.0 -> 4.1 merge, please remove this note and re-enable the
# error generation, by deleting the '#' characters below, and update the result.
# The changeset to merge in 4.1 is
# ChangeSet@1.1455.34.1, 2003-06-10 23:29:49+02:00, guilhem@mysql.com
sleep 1; #connection master;
show status like 'slave_running'; #load data infile '../../std_data/rpl_loaddata.dat' into table t1;
#save_master_pos;
#connection slave;
# The SQL slave thread should be stopped now.
#wait_for_slave_to_stop;