From 0accbd0364e0333e0b119aa9ce93e34ded9df6cb Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 25 Apr 2011 17:22:25 +0200 Subject: lots of post-merge changes --- mysql-test/suite/rpl/r/rpl_rotate_logs.result | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mysql-test/suite/rpl/r/rpl_rotate_logs.result') diff --git a/mysql-test/suite/rpl/r/rpl_rotate_logs.result b/mysql-test/suite/rpl/r/rpl_rotate_logs.result index 70e1d2f06e8..f529170d05e 100644 --- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result +++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result @@ -82,14 +82,15 @@ master-bin.000005 # master-bin.000006 # master-bin.000007 # master-bin.000008 # +master-bin.000009 # show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000008 # +master-bin.000009 # select * from t4; a testing temporary tables part 2 -Master_Log_File master-bin.000008 -Relay_Master_Log_File master-bin.000008 +Master_Log_File master-bin.000009 +Relay_Master_Log_File master-bin.000009 Checking that both slave threads are running. lock tables t3 read; select count(*) from t3 where n >= 4; -- cgit v1.2.1