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-08 14:52:14+08:00, hezx@stripped +9 -0
Some tests switching binlog format dynamically, add requirement to test this
mysql-test/extra/rpl_tests/rpl_truncate.test@stripped, 2008-01-08 14:52:11+08:00, hezx@stripped +1 -0
Test if server support switching binlog format dynamically
mysql-test/include/have_dynamic_binlog_format.inc@stripped, 2008-01-08 14:52:11+08:00, hezx@stripped +23 -0
New BitKeeper file ``mysql-test/include/have_dynamic_binlog_format.inc''
mysql-test/include/have_dynamic_binlog_format.inc@stripped, 2008-01-08 14:52:11+08:00, hezx@stripped +0 -0
mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test@stripped, 2008-01-08 14:52:11+08:00, hezx@stripped +1 -0
Test if server support switching binlog format dynamically
mysql-test/suite/rpl/t/rpl_found_rows.test@stripped, 2008-01-08 14:52:11+08:00, hezx@stripped +1 -0
Test if server support switching binlog format dynamically
mysql-test/suite/rpl/t/rpl_idempotency.test@stripped, 2008-01-08 14:52:11+08:00, hezx@stripped +1 -0
Test if server support switching binlog format dynamically
mysql-test/suite/rpl/t/rpl_sf.test@stripped, 2008-01-08 14:52:11+08:00, hezx@stripped +1 -0
Test if server support switching binlog format dynamically
mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test@stripped, 2008-01-08 14:52:11+08:00, hezx@stripped +1 -0
Test if server support switching binlog format dynamically
mysql-test/suite/rpl/t/rpl_temporary_errors.test@stripped, 2008-01-08 14:52:11+08:00, hezx@stripped +2 -1
Test if server support switching binlog format dynamically
mysql-test/suite/rpl/t/rpl_udf.test@stripped, 2008-01-08 14:52:11+08:00, hezx@stripped +1 -0
Test if server support switching binlog format dynamically
diff -Nrup a/mysql-test/extra/rpl_tests/rpl_truncate.test b/mysql-test/extra/rpl_tests/rpl_truncate.test
--- a/mysql-test/extra/rpl_tests/rpl_truncate.test 2006-12-07 22:18:27 +08:00
+++ b/mysql-test/extra/rpl_tests/rpl_truncate.test 2008-01-08 14:52:11 +08:00
@@ -7,6 +7,7 @@
#
# Author(s): Mats Kindahl
+--source include/have_dynamic_binlog_format.inc
--source include/master-slave.inc
let $format = STATEMENT;
diff -Nrup a/mysql-test/include/have_dynamic_binlog_format.inc b/mysql-test/include/have_dynamic_binlog_format.inc
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/include/have_dynamic_binlog_format.inc 2008-01-08 14:52:11 +08:00
@@ -0,0 +1,23 @@
+# can set binlog_format dynamically
+
+--disable_abort_on_error
+--disable_query_log
+--disable_result_log
+let $saved_binlog_format=query_get_value(show variables like 'binlog_format', Value, 1);
+set @@binlog_format= 'statement';
+
+--enable_result_log
+--require r/can_set_binlog_format.require
+--replace_result STATEMENT OK
+show variables like 'binlog_format';
+
+set @@binlog_format= 'row';
+--require r/can_set_binlog_format.require
+--replace_result ROW OK
+show variables like 'binlog_format';
+
+--disable_result_log
+eval set @@binlog_format=$saved_binlog_format;
+--enable_result_log
+--enable_query_log
+--enable_abort_on_error
diff -Nrup a/mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test b/mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test
--- a/mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test 2007-10-10 22:42:52 +08:00
+++ b/mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test 2008-01-08 14:52:11 +08:00
@@ -2,6 +2,7 @@
# Purpose: To test having extra columns on the master WL#3915
#############################################################
-- source include/master-slave.inc
+-- source include/have_dynamic_binlog_format.inc
let $engine_type = 'MyISAM';
diff -Nrup a/mysql-test/suite/rpl/t/rpl_found_rows.test b/mysql-test/suite/rpl/t/rpl_found_rows.test
--- a/mysql-test/suite/rpl/t/rpl_found_rows.test 2007-11-09 16:13:39 +08:00
+++ b/mysql-test/suite/rpl/t/rpl_found_rows.test 2008-01-08 14:52:11 +08:00
@@ -1,4 +1,5 @@
source include/master-slave.inc;
+source include/have_dynamic_binlog_format.inc;
# It is not possible to replicate FOUND_ROWS() using statement-based
# replication, but there is a workaround that stores the result of
diff -Nrup a/mysql-test/suite/rpl/t/rpl_idempotency.test b/mysql-test/suite/rpl/t/rpl_idempotency.test
--- a/mysql-test/suite/rpl/t/rpl_idempotency.test 2007-12-12 18:14:51 +08:00
+++ b/mysql-test/suite/rpl/t/rpl_idempotency.test 2008-01-08 14:52:11 +08:00
@@ -2,6 +2,7 @@
# work the same way under statement based as under row based.
source include/master-slave.inc;
+source include/have_dynamic_binlog_format.inc;
connection master;
CREATE TABLE t1 (a INT PRIMARY KEY);
diff -Nrup a/mysql-test/suite/rpl/t/rpl_sf.test b/mysql-test/suite/rpl/t/rpl_sf.test
--- a/mysql-test/suite/rpl/t/rpl_sf.test 2007-06-27 20:27:26 +08:00
+++ b/mysql-test/suite/rpl/t/rpl_sf.test 2008-01-08 14:52:11 +08:00
@@ -1,4 +1,5 @@
-- source include/have_log_bin.inc
+-- source include/have_dynamic_binlog_format.inc
# Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
diff -Nrup a/mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test b/mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test
--- a/mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test 2007-06-27 20:27:33 +08:00
+++ b/mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test 2008-01-08 14:52:11 +08:00
@@ -1,6 +1,7 @@
# we run first in statement-based then in mixed binlogging
--source include/have_binlog_format_mixed_or_statement.inc
+--source include/have_dynamic_binlog_format.inc
--source include/master-slave.inc
--source include/not_embedded.inc
--source include/not_windows.inc
diff -Nrup a/mysql-test/suite/rpl/t/rpl_temporary_errors.test b/mysql-test/suite/rpl/t/rpl_temporary_errors.test
--- a/mysql-test/suite/rpl/t/rpl_temporary_errors.test 2007-12-12 18:14:51 +08:00
+++ b/mysql-test/suite/rpl/t/rpl_temporary_errors.test 2008-01-08 14:52:11 +08:00
@@ -1,4 +1,5 @@
source include/master-slave.inc;
+source include/have_dynamic_binlog_format.inc;
--echo **** On Master ****
connection master;
@@ -23,7 +24,7 @@ sync_slave_with_master;
set @@global.slave_exec_mode= default;
SHOW STATUS LIKE 'Slave_retried_transactions';
SELECT * FROM t1;
-source include/show_slave_status.inc;
+source include/show_slave_status2.inc;
DROP TABLE t1;
--echo **** On Master ****
diff -Nrup a/mysql-test/suite/rpl/t/rpl_udf.test b/mysql-test/suite/rpl/t/rpl_udf.test
--- a/mysql-test/suite/rpl/t/rpl_udf.test 2007-06-27 20:27:31 +08:00
+++ b/mysql-test/suite/rpl/t/rpl_udf.test 2008-01-08 14:52:11 +08:00
@@ -5,6 +5,7 @@
# statement based format. This tests work completed in WL#3629. #
###################################################################
+--source include/have_dynamic_binlog_format.inc
--source include/not_embedded.inc
--source include/master-slave.inc
| Thread |
|---|
| • bk commit into 5.1 tree (hezx:1.2659) | hezx | 8 Jan |
