bzr commit into mysql-6.0-bugteam branch (Serge.Kozlov:3000)

[Serge Kozlov]

#At file:///home/ksm/sun/repo/action-02-01/rpl_ndb_log/mysql-6.0-bugteam/ based on revid:sergey.glukhov@stripped

 3000 Serge Kozlov	2009-02-02 [merge]
      Post-merge patch for extra/rpl_test/rpl_log.test: 
      Remove size of binlog file from SHOW BINARY LOGS. 
      Changing size of binlog file is an affect of adding or removing events to/from
      binlog and it can be checked in next command of test: SHOW BINLOG EVENTS.
      For SHOW BINARY LOGS statement enough to show the list of file names.
modified:
  mysql-test/extra/rpl_tests/rpl_log.test
  mysql-test/suite/rpl/r/rpl_row_log.result
  mysql-test/suite/rpl/r/rpl_row_log_innodb.result
  mysql-test/suite/rpl/r/rpl_stm_log.result

=== modified file 'mysql-test/extra/rpl_tests/rpl_log.test'
--- a/mysql-test/extra/rpl_tests/rpl_log.test	2008-12-24 10:48:24 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_log.test	2009-02-02 11:48:47 +0000
@@ -69,6 +69,7 @@ connection master;
 select * from t1 order by 1 asc;
 
 sync_slave_with_master;
+
 #check t1 on slave to ensure whether it's identical with on master
 select * from t1 order by 1 asc;
 flush logs;
@@ -86,9 +87,11 @@ source include/show_binlog_events.inc;
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events in 'master-bin.000002';
+--replace_column 2 #
 show binary logs;
 sync_slave_with_master;
 --source include/wait_for_slave_to_start.inc
+--replace_column 2 #
 show binary logs;
 --replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
 --replace_column 2 # 5 #

=== modified file 'mysql-test/suite/rpl/r/rpl_row_log.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log.result	2008-12-24 10:48:24 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log.result	2009-02-02 11:48:47 +0000
@@ -214,12 +214,12 @@ master-bin.000002	#	Write_rows	1	#	table
 master-bin.000002	#	Query	1	#	use `test`; COMMIT
 show binary logs;
 Log_name	File_size
-master-bin.000001	1541
-master-bin.000002	517
+master-bin.000001	#
+master-bin.000002	#
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1639
-slave-bin.000002	418
+slave-bin.000001	#
+slave-bin.000002	#
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

=== modified file 'mysql-test/suite/rpl/r/rpl_row_log_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2008-12-24 10:48:24 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2009-02-02 11:48:47 +0000
@@ -214,12 +214,12 @@ master-bin.000002	#	Write_rows	1	#	table
 master-bin.000002	#	Xid	1	#	COMMIT /* XID */
 show binary logs;
 Log_name	File_size
-master-bin.000001	1457
-master-bin.000002	475
+master-bin.000001	#
+master-bin.000002	#
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1537
-slave-bin.000002	367
+slave-bin.000001	#
+slave-bin.000002	#
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_log.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result	2008-12-24 10:48:24 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result	2009-02-02 11:48:47 +0000
@@ -203,12 +203,12 @@ master-bin.000002	#	Query	1	#	use `test`
 master-bin.000002	#	Query	1	#	use `test`; insert into t2 values (1)
 show binary logs;
 Log_name	File_size
-master-bin.000001	1348
-master-bin.000002	393
+master-bin.000001	#
+master-bin.000002	#
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1451
-slave-bin.000002	294
+slave-bin.000001	#
+slave-bin.000002	#
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4