bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3363 to 3364) WL#5569

[Andrei Elkin]

 3364 Andrei Elkin	2011-08-18
      wl#5569 MTS
      
      Refining rpl_rotate_logs that could not produce deterministic output. The list of binlogs contained
      one binlog more than expected.
     @ mysql-test/suite/rpl/r/rpl_rotate_logs.result
        results updated.
     @ mysql-test/suite/rpl/t/rpl_rotate_logs.test
        Refining a method of verification of the binlog rotation due to its max size:
        we check if the first log has been rotated by comparing its name before and after
        feeding load to the master.
        Notice, that as the former so the new current proof methods are not perfect
        as that part of the test really needs to demostrate every binlog file is less than
        @@max_binlog_size.

    modified:
      mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/t/rpl_rotate_logs.test
 3363 Andrei Elkin	2011-08-18
      updating result files that were left incorrect by the last merge.

    modified:
      mysql-test/r/information_schema.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
=== modified file 'mysql-test/suite/rpl/r/rpl_rotate_logs.result'
--- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2011-06-18 18:58:21 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2011-08-18 14:09:22 +0000
@@ -77,22 +77,9 @@ select count(*) from t3 where n >= 4;
 count(*)
 90
 create table t4 select * from temp_table;
-show binary logs;
-Log_name	File_size
-master-bin.000003	#
-master-bin.000004	#
-master-bin.000005	#
-master-bin.000006	#
-master-bin.000007	#
-master-bin.000008	#
-show master status;
-File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000008	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
 select * from t4;
 a
 testing temporary tables part 2
-Master_Log_File = 'master-bin.000008'
-Relay_Master_Log_File = 'master-bin.000008'
 include/check_slave_is_running.inc
 lock tables t3 read;
 select count(*) from t3 where n >= 4;

=== modified file 'mysql-test/suite/rpl/t/rpl_rotate_logs.test'
--- a/mysql-test/suite/rpl/t/rpl_rotate_logs.test	2011-06-18 18:58:21 +0000
+++ b/mysql-test/suite/rpl/t/rpl_rotate_logs.test	2011-08-18 14:09:22 +0000
@@ -152,10 +152,10 @@ connection master;
 create temporary table temp_table (a char(80) not null);
 insert into temp_table values ("testing temporary tables part 2");
 
-# the nummber of produced logs is sensitive to whether checksum is NONE or CRC32
-# the value of 90 makes it even
+# Generate some number of logs and prove rotation by comparing the first and the last
 let $1=90;
 
+let $first=query_get_value("SHOW MASTER STATUS", "File", 1);
 create table t3 (n int);
 disable_query_log;
 while ($1)
@@ -167,12 +167,14 @@ while ($1)
 enable_query_log;
 select count(*) from t3 where n >= 4;
 create table t4 select * from temp_table;
-source include/show_binary_logs.inc;
-source include/show_master_status.inc;
+let $last=query_get_value("SHOW MASTER STATUS", "File", 1);
+if (`select '$first' like '$last'`)
+{
+  --die No expected logs rotation
+} 
 sync_slave_with_master;
 select * from t4;
 
-source include/show_slave_status.inc;
 source include/check_slave_is_running.inc;
 # because of concurrent insert, the table may not be up to date
 # if we do not lock

No bundle (reason: useless for push emails).