From 37d0ecdfd71f293b6e6f0f75cf1029afcfca8c45 Mon Sep 17 00:00:00 2001 From: Luis Soares Date: Fri, 8 Jan 2010 15:56:26 +0000 Subject: [PATCH] Fixes rpl_stm_loaddata_concurrent failure in PB2. The test case did not start with fresh binlogs, so in some cases, dependending on the order MTR runs the tests, it would try to show binlog contents from invalid positions (binary log would contain unexpected events from previous test). We fix this by deploying a RESET MASTER at the beginning of the test case. --- mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result | 1 + mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test | 1 + 2 files changed, 2 insertions(+) diff --git a/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result b/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result index 23d8cd01b8b..ee881752dec 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result +++ b/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result @@ -1,3 +1,4 @@ +RESET MASTER; CREATE TABLE t1 (c1 char(50)); LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; LOAD DATA CONCURRENT INFILE '../../std_data/words.dat' INTO TABLE t1; diff --git a/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test b/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test index 8aeb1cf87fc..2ea95a63fb5 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test +++ b/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test @@ -1,6 +1,7 @@ -- source include/not_ndb_default.inc -- source include/have_log_bin.inc -- source include/have_binlog_format_statement.inc +RESET MASTER; let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1); CREATE TABLE t1 (c1 char(50));