mirror of
https://github.com/MariaDB/server.git
synced 2025-07-04 01:23:45 +03:00
9cb096ac98
Problem: the test failed because errors were found in the error log.
The test case contains suppressions for an old version of the error message,
but the format of the error message has changed without updating the suppression.
Fix: Update the suppression. Also small fixes to improve the test.
mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result:
update result file
mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt:
Use variables instead of .opt files to avoid server restarts.
mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test:
1. To fix the bug, we update the regular expression in mtr.add_suppression
so that it matches the real error text.
2. Use wait_for_slave_sql_error.inc when we wait for an error.
This makes the test easier to understand and will produce better
debug info if the test fails.
3. Use server variables instead of command line options to set
the @@GLOBAL.DEBUG variable. This avoids server restarts when
running the test suite.
4. Clarify the comment at the top of the file and add bug reference.
22 lines
825 B
Plaintext
22 lines
825 B
Plaintext
include/master-slave.inc
|
|
[connection master]
|
|
SET @@GLOBAL.DEBUG = '+d,remove_slave_load_file_before_write';
|
|
create table t1(a int not null auto_increment, b int, primary key(a)) engine=innodb;
|
|
start transaction;
|
|
insert into t1(b) values (1);
|
|
insert into t1(b) values (2);
|
|
load data infile '../../std_data/rpl_loaddata.dat' into table t1;
|
|
commit;
|
|
include/wait_for_slave_sql_error.inc [errno=29, 13]
|
|
drop table t1;
|
|
include/sync_slave_io_with_master.inc
|
|
include/stop_slave_io.inc
|
|
RESET SLAVE;
|
|
drop table t1;
|
|
call mtr.add_suppression("Slave: Can't get stat of .*");
|
|
call mtr.add_suppression("Slave SQL: Error .Can.t get stat of.* Error_code: 13");
|
|
call mtr.add_suppression("Slave: File.* not found.*");
|
|
call mtr.add_suppression("Slave SQL: Error .File.* not found.* Error_code: 29");
|
|
SET @@GLOBAL.DEBUG = '';
|
|
include/rpl_end.inc
|