mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Fixed test failures (bugs in test suite)
mysql-test/suite/percona/percona_log_slow_slave_statements.test: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-control_global_slow.result: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.result: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.result: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-long_query_time.result: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-long_query_time.test: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.result: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.result: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.result: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test: Replaced 'grep | wc -l' with 'grep -c' as output of wc -l is not portable (for example on Mac) mysql-test/suite/rpl/r/rpl_stm_until.result: Updated results mysql-test/suite/rpl/t/rpl_stm_until.test: Fixed random failure in test suite: master could be reading data from master-bin.00001 at the same time as test suite was changing it.
This commit is contained in:
@@ -196,13 +196,18 @@ sync_with_master;
|
||||
|
||||
connection master;
|
||||
drop table if exists t1; # there is create table t1 in bug47142_master-bin.000001
|
||||
sync_slave_with_master;
|
||||
connection slave;
|
||||
stop slave;
|
||||
connection master;
|
||||
|
||||
flush logs;
|
||||
let $MYSQLD_DATADIR= `select @@datadir`;
|
||||
--remove_file $MYSQLD_DATADIR/master-bin.000001
|
||||
--copy_file $MYSQL_TEST_DIR/std_data/bug47142_master-bin.000001 $MYSQLD_DATADIR/master-bin.000001
|
||||
flush logs;
|
||||
|
||||
connection slave;
|
||||
stop slave;
|
||||
reset slave;
|
||||
start slave until master_log_file='master-bin.000001', master_log_pos=294 /* to stop right before DROP */;
|
||||
--source include/wait_for_slave_sql_to_stop.inc
|
||||
|
Reference in New Issue
Block a user