bk commit into 5.1 tree (hezx:1.2676)

[hezx]

Below is the list of changes that have just been committed into a local
5.1 repository of hezx. When hezx does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-17 16:40:31+08:00, hezx@stripped +6 -0
  fixes for versional test

  mysql-test/suite/rpl/r/rpl_row_max_relay_size.result@stripped, 2008-01-17 16:40:28+08:00, hezx@stripped +0 -2
    update result

  mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result@stripped, 2008-01-17 16:40:28+08:00, hezx@stripped +0 -4
    test requires dynamic binlog format switching, and some older version do not have default value for binlog_format

  mysql-test/suite/rpl/t/rpl000017-slave.opt@stripped, 2008-01-17 16:40:28+08:00, hezx@stripped +1 -1
    do not replicate changes to system database

  mysql-test/suite/rpl/t/rpl_binlog_grant.test@stripped, 2008-01-17 16:40:28+08:00, hezx@stripped +2 -2
    mask out binlog positions and unrelated information for show binlog events

  mysql-test/suite/rpl/t/rpl_row_max_relay_size.test@stripped, 2008-01-17 16:40:28+08:00, hezx@stripped +2 -3
    this test actually requires row logging

  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test@stripped, 2008-01-17 16:40:28+08:00, hezx@stripped +4 -2
    test requires dynamic binlog format switching, and some older version do not have default value for binlog_format

diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
--- a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result	2008-01-14 15:37:56 +08:00
+++ b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result	2008-01-17 16:40:28 +08:00
@@ -1,5 +1,3 @@
-SET SESSION BINLOG_FORMAT=ROW;
-SET GLOBAL BINLOG_FORMAT=ROW;
 stop slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 reset master;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result b/mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
--- a/mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result	2007-12-14 21:40:43 +08:00
+++ b/mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result	2008-01-17 16:40:28 +08:00
@@ -20,10 +20,6 @@ set session binlog_format=row;
 show session variables like "binlog_format%";
 Variable_name	Value
 binlog_format	ROW
-set global binlog_format=DEFAULT;
-show global variables like "binlog_format%";
-Variable_name	Value
-binlog_format	MIXED
 set global binlog_format=MIXED;
 show global variables like "binlog_format%";
 Variable_name	Value
diff -Nrup a/mysql-test/suite/rpl/t/rpl000017-slave.opt b/mysql-test/suite/rpl/t/rpl000017-slave.opt
--- a/mysql-test/suite/rpl/t/rpl000017-slave.opt	2007-06-27 20:27:25 +08:00
+++ b/mysql-test/suite/rpl/t/rpl000017-slave.opt	2008-01-17 16:40:28 +08:00
@@ -1 +1 @@
---skip-slave-start
+--skip-slave-start --replicate-ignore-db=mysql
diff -Nrup a/mysql-test/suite/rpl/t/rpl_binlog_grant.test b/mysql-test/suite/rpl/t/rpl_binlog_grant.test
--- a/mysql-test/suite/rpl/t/rpl_binlog_grant.test	2007-11-23 19:51:11 +08:00
+++ b/mysql-test/suite/rpl/t/rpl_binlog_grant.test	2008-01-17 16:40:28 +08:00
@@ -27,7 +27,7 @@ rollback;
 show grants for x@y;
 --replace_result $VERSION VERSION
 --replace_regex /\/\* xid=.* \*\//\/* XID *\//
-show binlog events;
+source include/show_binlog_events.inc;
 start transaction;
 insert into t values (2);
 revoke select on t from x@y;
@@ -39,6 +39,6 @@ select * from t;
 show grants for x@y;
 --replace_result $VERSION VERSION
 --replace_regex /\/\* xid=.* \*\//\/* XID *\//
-show binlog events;
+source include/show_binlog_events.inc;
 drop user x@y;
 drop database d1;
diff -Nrup a/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test b/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test
--- a/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test	2007-06-27 20:27:29 +08:00
+++ b/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test	2008-01-17 16:40:28 +08:00
@@ -3,9 +3,8 @@
 # for relay logs too).
 # Test of manual relay log rotation with FLUSH LOGS.
 
-# Requires statement logging
+# Requires row logging
+-- source include/have_binlog_format_row.inc
 -- source include/not_ndb_default.inc
-SET SESSION BINLOG_FORMAT=ROW;
-SET GLOBAL BINLOG_FORMAT=ROW;
 -- source extra/rpl_tests/rpl_max_relay_size.test
 
diff -Nrup a/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
--- a/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test	2007-12-06 23:26:59 +08:00
+++ b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test	2008-01-17 16:40:28 +08:00
@@ -9,6 +9,7 @@
 #   - correctness of execution
 
 
+-- source include/have_dynamic_binlog_format.inc
 -- source include/not_ndb_default.inc
 -- source include/master-slave.inc
 
@@ -30,8 +31,9 @@ show session variables like "binlog_form
 set session binlog_format=row;
 show session variables like "binlog_format%";
 
-set global binlog_format=DEFAULT;
-show global variables like "binlog_format%";
+# Some versions don't have default value for binlog_format
+#set global binlog_format=DEFAULT;
+#show global variables like "binlog_format%";
 set global binlog_format=MIXED;
 show global variables like "binlog_format%";
 set global binlog_format=STATEMENT;