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

Bug #26622 MASTER_POS_WAIT does not work as documented

Affected tests fixing. After the fix for st_relay_log_info::wait_for_pos() that
handles widely used select('master-bin.xxxx',pos) invoked by mysqltest
there appeared to be four tests that either tried synchronizing when
the slave was stopped or used incorrect synchronization method like
to call `sync_with_master' from the current connection being to the
master itself.

Fixed with correcting the current connection or/and using the correct
synchronization macro when possible.


mysql-test/r/rpl_loaddata.result:
  results changed
mysql-test/r/rpl_slave_status.result:
  results changed
mysql-test/t/rpl_loaddata.test:
  fixing cleanup for two tests
mysql-test/t/rpl_skip_error.test:
  fixing cleanup for two tests
mysql-test/t/rpl_slave_status.test:
  fixing cleanup
mysql-test/t/rpl_temporary.test:
  fixing synchronizations to use the intended correct macro.
This commit is contained in:
unknown
2008-03-07 21:14:28 +02:00
parent 04c5af1802
commit 0e679ab782
6 changed files with 25 additions and 8 deletions

View File

@ -147,12 +147,20 @@ terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
'\n##\n' starting by '>' ignore 1 lines;
connection slave;
wait_for_slave_to_stop;
drop table t2;
# cleanup:
set @@global.sql_slave_skip_counter=1;
start slave;
connection master;
drop table t2;
drop table t1;
sync_slave_with_master;
# BUG#17233 LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed
connection master;
CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;
--error 1062
@ -160,5 +168,6 @@ LOAD DATA INFILE "../std_data_ln/words.dat" INTO TABLE t1;
DROP TABLE t1;
sync_with_master;
sync_slave_with_master;
# End of 4.1 tests