Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin 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, 2006-08-25 19:37:32+03:00, aelkin@stripped +44 -0
WL#3368 mixed default binlog format
Changes are made within two changesets according to HLD/LLD.
The following is an excerption from the WL.
1. Change so that MIXED is default format
1.1 to change the default for command line --binlog-format
1.2 to alter global_system_variables.binlog_format calculation
basing on command line --binlog-format parameter and
its default.
2. Change test suite so that more testing is done by MIXED format.
2.1 to check if there are test cases requiring --binlog-foramt=statement via
`source include/have_binlog_format_statement.inc' and affected by
altering the latter to be "mixed".
2.2 to check the content of such vulnerable cases to find if
extending to the mixed does not modify results. In that case simply
substitute source arguments as explained.
2.3 if a test in mixed mode deals with features triggering
row-binlogging then if necessary we can switch explicitly
to statement mode or create another test to run with
non-recommended STATEMENT mode
Particullarily, extracting INSERT DELAYED
binlogging subtest for statement mode is performed, and
the snippet is moved into a separate test file
(of the 2nd comming changeset).
Note that since now all tree modes verify this use case
through 3 different tests. Statement mode main file is coming
with the 2nd changeset.
No changes in item 3 of HLD appeared to be needed.
mysql-test/extra/binlog_tests/binlog.test@stripped, 2006-08-25 19:37:09+03:00, aelkin@stripped +1 -21
Moving INSERT DELAYED verification section into separate file. The latter is sourced
from two different files: the current one and a newly created for STATEMENT
mode check. The last one is comming in the following changeset.
mysql-test/extra/binlog_tests/binlog_insert_delayed.test@stripped, 2006-08-25 19:37:25+03:00, aelkin@stripped +22 -0
BitKeeper file /home/elkin/MySQL/TEAM/FIXES/5.1/wl3368_mixed/mysql-test/extra/binlog_tests/binlog_insert_delayed.test
mysql-test/extra/binlog_tests/binlog_insert_delayed.test@stripped, 2006-08-25 19:37:25+03:00, aelkin@stripped +0 -0
mysql-test/extra/rpl_tests/rpl_loaddata.test@stripped, 2006-08-25 19:37:09+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/extra/rpl_tests/rpl_stm_000001.test@stripped, 2006-08-25 19:37:09+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/extra/rpl_tests/rpl_stm_charset.test@stripped, 2006-08-25 19:37:10+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/r/binlog_stm_binlog.result@stripped, 2006-08-25 19:37:10+03:00, aelkin@stripped +6 -4
result changed
mysql-test/r/rpl_rbr_to_sbr.result@stripped, 2006-08-25 19:37:10+03:00, aelkin@stripped +0 -3
result changed
mysql-test/t/archive.test@stripped, 2006-08-25 19:37:11+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/binlog_statement_mode_insert_delayed.test@stripped, 2006-08-25 19:37:25+03:00, aelkin@stripped +6 -0
BitKeeper file /home/elkin/MySQL/TEAM/FIXES/5.1/wl3368_mixed/mysql-test/t/binlog_statement_mode_insert_delayed.test
mysql-test/t/binlog_statement_mode_insert_delayed.test@stripped, 2006-08-25 19:37:25+03:00, aelkin@stripped +0 -0
mysql-test/t/binlog_stm_binlog.test@stripped, 2006-08-25 19:37:11+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/binlog_stm_blackhole.test@stripped, 2006-08-25 19:37:11+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/binlog_stm_ctype_cp932.test@stripped, 2006-08-25 19:37:12+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/binlog_stm_ctype_ucs.test@stripped, 2006-08-25 19:37:12+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/binlog_stm_drop_tmp_tbl.test@stripped, 2006-08-25 19:37:13+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/binlog_stm_innodb_stat.test@stripped, 2006-08-25 19:37:13+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/binlog_stm_insert_select.test@stripped, 2006-08-25 19:37:13+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/binlog_stm_mix_innodb_myisam.test@stripped, 2006-08-25 19:37:14+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/create_select_tmp.test@stripped, 2006-08-25 19:37:14+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/ctype_cp932_binlog_stm.test@stripped, 2006-08-25 19:37:14+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/date_formats.test@stripped, 2006-08-25 19:37:15+03:00, aelkin@stripped +3 -3
MIXED case added to replace instuction
mysql-test/t/mysqlbinlog.test@stripped, 2006-08-25 19:37:15+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/mysqlbinlog2.test@stripped, 2006-08-25 19:37:15+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/ndb_multi.test@stripped, 2006-08-25 19:37:16+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl000013.test@stripped, 2006-08-25 19:37:16+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_heap.test@stripped, 2006-08-25 19:37:17+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_loaddata_s.test@stripped, 2006-08-25 19:37:17+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_mixed_ddl_dml.test@stripped, 2006-08-25 19:37:17+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_rbr_to_sbr.test@stripped, 2006-08-25 19:37:18+03:00, aelkin@stripped +1 -2
Rather meaningless line is discared. The test does not loose anything without it and without considering the WL.
mysql-test/t/rpl_rewrt_db.test@stripped, 2006-08-25 19:37:18+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_rotate_logs.test@stripped, 2006-08-25 19:37:18+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_stm_EE_err2.test@stripped, 2006-08-25 19:37:19+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_stm_flsh_tbls.test@stripped, 2006-08-25 19:37:19+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_stm_log.test@stripped, 2006-08-25 19:37:19+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_stm_max_relay_size.test@stripped, 2006-08-25 19:37:20+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_stm_multi_query.test@stripped, 2006-08-25 19:37:20+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_stm_mystery22.test@stripped, 2006-08-25 19:37:21+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_stm_no_op.test@stripped, 2006-08-25 19:37:21+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_stm_reset_slave.test@stripped, 2006-08-25 19:37:21+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_stm_until.test@stripped, 2006-08-25 19:37:22+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_temp_table.test@stripped, 2006-08-25 19:37:22+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_trigger.test@stripped, 2006-08-25 19:37:22+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/rpl_trunc_temp.test@stripped, 2006-08-25 19:37:23+03:00, aelkin@stripped +1 -1
require mixed_or_statement
mysql-test/t/user_var-binlog.test@stripped, 2006-08-25 19:37:23+03:00, aelkin@stripped +1 -1
require mixed_or_statement
sql/mysqld.cc@stripped, 2006-08-25 19:37:24+03:00, aelkin@stripped +11 -1
Implementation of making BINLOG_FORMAT_MIXED to be the default of global_system_variables.binlog_format.
Not in the case of embedded.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: aelkin
# Host: dsl-hkigw8-feaaf900-177.dhcp.inet.fi
# Root: /net/nb/home/elkin/MySQL/TEAM/FIXES/5.1/wl3368_mixed
--- 1.570/sql/mysqld.cc 2006-08-25 19:38:00 +03:00
+++ 1.571/sql/mysqld.cc 2006-08-25 19:38:00 +03:00
@@ -3134,7 +3134,11 @@
global_system_variables.binlog_format= BINLOG_FORMAT_ROW;
else
#endif
+#if defined(HAVE_ROW_BASED_REPLICATION)
+ global_system_variables.binlog_format= BINLOG_FORMAT_MIXED;
+#else
global_system_variables.binlog_format= BINLOG_FORMAT_STMT;
+#endif
}
/* Check that we have not let the format to unspecified at this point */
@@ -4935,7 +4939,13 @@
"supports only statement-based binary logging, so only 'statement' is "
"a legal value."
#endif
- , 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
+ , 0, 0, 0, GET_STR, REQUIRED_ARG,
+#ifdef HAVE_ROW_BASED_REPLICATION
+ BINLOG_FORMAT_MIXED
+#else
+ BINLOG_FORMAT_STMT
+#endif
+ , 0, 0, 0, 0, 0 },
{"binlog-do-db", OPT_BINLOG_DO_DB,
"Tells the master it should log updates for the specified database, and exclude all others not explicitly mentioned.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
--- New file ---
+++ mysql-test/extra/binlog_tests/binlog_insert_delayed.test 06/08/25 19:37:25
# Test of binlogging of INSERT_ID with INSERT DELAYED
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
# First, avoid BUG#20627:
set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
# Verify that only one INSERT_ID event is binlogged.
# Note, that because of WL#3368 mixed mode binlog records RBR events for the delayed
insert delayed into t1 values (207);
# We use sleeps between statements, that's the only way to get a
# repeatable binlog in a normal test run and under Valgrind.
# It may be that the "binlog missing rows" of BUG#20821 shows up
# here.
sleep 2;
insert delayed into t1 values (null);
sleep 2;
insert delayed into t1 values (300);
sleep 2; # time for the delayed queries to reach disk
select * from t1;
--replace_column 2 # 5 #
--replace_regex /table_id: [0-9]+/table_id: #/
show binlog events from 102;
drop table t1;
--- New file ---
+++ mysql-test/t/binlog_statement_mode_insert_delayed.test 06/08/25 19:37:25
# This test is to verify replication with INSERT DELAY through
# unrecommended STATEMENT binlog format
-- source include/not_embedded.inc
-- source include/have_binlog_format_statement.inc
-- source extra/binlog_tests/binlog_insert_delayed.test
--- 1.23/mysql-test/t/archive.test 2006-08-25 19:38:00 +03:00
+++ 1.24/mysql-test/t/archive.test 2006-08-25 19:38:00 +03:00
@@ -3,7 +3,7 @@
# Taken FROM the select test
#
-- source include/have_archive.inc
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
--disable_warnings
drop table if exists t1,t2,t3;
--- 1.26/mysql-test/t/mysqlbinlog.test 2006-08-25 19:38:00 +03:00
+++ 1.27/mysql-test/t/mysqlbinlog.test 2006-08-25 19:38:00 +03:00
@@ -1,6 +1,6 @@
# We are using .opt file since we need small binlog size
# TODO: Need to look at making a row based version once the new row based client is completed. [jbm]
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
--- 1.24/mysql-test/t/rpl_stm_until.test 2006-08-25 19:38:00 +03:00
+++ 1.25/mysql-test/t/rpl_stm_until.test 2006-08-25 19:38:00 +03:00
@@ -1,4 +1,4 @@
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/master-slave.inc
# Test is dependent on binlog positions
--- 1.19/mysql-test/t/date_formats.test 2006-08-25 19:38:00 +03:00
+++ 1.20/mysql-test/t/date_formats.test 2006-08-25 19:38:00 +03:00
@@ -6,9 +6,9 @@
drop table if exists t1;
--enable_warnings
---replace_result ROW <format> STATEMENT <format>
+--replace_result ROW <format> STATEMENT <format> MIXED <format>
SHOW GLOBAL VARIABLES LIKE "%_format%";
---replace_result ROW <format> STATEMENT <format>
+--replace_result ROW <format> STATEMENT <format> MIXED <format>
SHOW SESSION VARIABLES LIKE "%_format%";
#
@@ -36,7 +36,7 @@
set datetime_format= '%h:%i:%s %p %Y-%m-%d';
set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d';
---replace_result ROW <format> STATEMENT <format>
+--replace_result ROW <format> STATEMENT <format> MIXED <format>
SHOW SESSION VARIABLES LIKE "%format";
--error 1231
--- 1.13/mysql-test/t/create_select_tmp.test 2006-08-25 19:38:00 +03:00
+++ 1.14/mysql-test/t/create_select_tmp.test 2006-08-25 19:38:00 +03:00
@@ -6,7 +6,7 @@
# inconsistency between binlog and the internal list of temp tables.
# This does not work for RBR yet.
---source include/have_binlog_format_statement.inc
+--source include/have_binlog_format_mixed_or_statement.inc
-- source include/have_innodb.inc
--disable_warnings
--- 1.9/mysql-test/t/mysqlbinlog2.test 2006-08-25 19:38:00 +03:00
+++ 1.10/mysql-test/t/mysqlbinlog2.test 2006-08-25 19:38:00 +03:00
@@ -2,7 +2,7 @@
# and a few others.
# TODO: Need to look at making row based version once new binlog client is complete.
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
--- 1.19/mysql-test/extra/rpl_tests/rpl_stm_charset.test 2006-08-25 19:38:00 +03:00
+++ 1.20/mysql-test/extra/rpl_tests/rpl_stm_charset.test 2006-08-25 19:38:00 +03:00
@@ -2,7 +2,7 @@
# This test will fail if the server/client does not support enough charsets.
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
source include/master-slave.inc;
--disable_warnings
--- 1.10/mysql-test/t/rpl_heap.test 2006-08-25 19:38:00 +03:00
+++ 1.11/mysql-test/t/rpl_heap.test 2006-08-25 19:38:00 +03:00
@@ -1,5 +1,5 @@
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
# You must run this test with --manager.
--- 1.15/mysql-test/t/rpl_loaddata_s.test 2006-08-25 19:38:00 +03:00
+++ 1.16/mysql-test/t/rpl_loaddata_s.test 2006-08-25 19:38:00 +03:00
@@ -2,7 +2,7 @@
# replicated LOAD DATA INFILE correctly when it has binlog_*_db rules.
# This is for BUG#1100 (LOAD DATA INFILE was half-logged).
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/master-slave.inc
connection slave;
--- 1.9/mysql-test/t/rpl_rewrt_db.test 2006-08-25 19:38:00 +03:00
+++ 1.10/mysql-test/t/rpl_rewrt_db.test 2006-08-25 19:38:00 +03:00
@@ -1,5 +1,5 @@
# TBF - difference in row level logging
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/master-slave.inc
--disable_warnings
--- 1.6/mysql-test/t/user_var-binlog.test 2006-08-25 19:38:00 +03:00
+++ 1.7/mysql-test/t/user_var-binlog.test 2006-08-25 19:38:00 +03:00
@@ -1,5 +1,5 @@
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
# TODO: Create row based version once $MYSQL_BINLOG has new RB version
# Embedded server does not support binlogging
--source include/not_embedded.inc
--- 1.1/mysql-test/t/rpl_stm_EE_err2.test 2006-08-25 19:38:00 +03:00
+++ 1.2/mysql-test/t/rpl_stm_EE_err2.test 2006-08-25 19:38:00 +03:00
@@ -3,6 +3,6 @@
# Date: 2006-01-11
# Purpose: Engine Wrapper for rpl_stm_EE_err2.test
##############################
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
let $engine_type=myisam;
-- source extra/rpl_tests/rpl_stm_EE_err2.test
--- 1.3/mysql-test/extra/rpl_tests/rpl_loaddata.test 2006-08-25 19:38:00 +03:00
+++ 1.4/mysql-test/extra/rpl_tests/rpl_loaddata.test 2006-08-25 19:38:00 +03:00
@@ -1,5 +1,5 @@
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
# See if replication of a "LOAD DATA in an autoincrement column"
# Honours autoincrement values
--- 1.5/mysql-test/t/binlog_stm_binlog.test 2006-08-25 19:38:00 +03:00
+++ 1.6/mysql-test/t/binlog_stm_binlog.test 2006-08-25 19:38:00 +03:00
@@ -13,6 +13,6 @@
# For both statement and row based bin logs 9/19/2005 [jbm]
-- source include/not_embedded.inc
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/binlog_tests/binlog.test
--- 1.2/mysql-test/t/binlog_stm_blackhole.test 2006-08-25 19:38:00 +03:00
+++ 1.3/mysql-test/t/binlog_stm_blackhole.test 2006-08-25 19:38:00 +03:00
@@ -2,5 +2,5 @@
# For both statement and row based bin logs 9/19/2005 [jbm]
-- source include/not_embedded.inc
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/binlog_tests/blackhole.test
--- 1.2/mysql-test/t/binlog_stm_ctype_cp932.test 2006-08-25 19:38:00 +03:00
+++ 1.3/mysql-test/t/binlog_stm_ctype_cp932.test 2006-08-25 19:38:00 +03:00
@@ -2,5 +2,5 @@
# For both statement and row based bin logs 9/19/2005 [jbm]
-- source include/not_embedded.inc
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/binlog_tests/ctype_cp932.test
--- 1.1/mysql-test/t/binlog_stm_ctype_ucs.test 2006-08-25 19:38:00 +03:00
+++ 1.2/mysql-test/t/binlog_stm_ctype_ucs.test 2006-08-25 19:38:00 +03:00
@@ -1,6 +1,6 @@
# This is a wrapper for binlog.test so that the same test case can be used
# For both statement and row based bin logs 9/19/2005 [jbm]
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/binlog_tests/ctype_ucs_binlog.test
--- 1.1/mysql-test/t/binlog_stm_drop_tmp_tbl.test 2006-08-25 19:38:00 +03:00
+++ 1.2/mysql-test/t/binlog_stm_drop_tmp_tbl.test 2006-08-25 19:38:00 +03:00
@@ -1,5 +1,5 @@
# This is a wrapper for binlog.test so that the same test case can be used
# For both statement and row based bin logs 9/19/2005 [jbm]
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/binlog_tests/drop_temp_table.test
--- 1.1/mysql-test/t/binlog_stm_innodb_stat.test 2006-08-25 19:38:00 +03:00
+++ 1.2/mysql-test/t/binlog_stm_innodb_stat.test 2006-08-25 19:38:00 +03:00
@@ -1,5 +1,5 @@
# This is a wrapper for binlog.test so that the same test case can be used
# For both statement and row based bin logs 9/19/2005 [jbm]
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/binlog_tests/innodb_stat.test
--- 1.1/mysql-test/t/binlog_stm_insert_select.test 2006-08-25 19:38:00 +03:00
+++ 1.2/mysql-test/t/binlog_stm_insert_select.test 2006-08-25 19:38:00 +03:00
@@ -1,5 +1,5 @@
# This is a wrapper for binlog.test so that the same test case can be used
# For both statement and row based bin logs 9/19/2005 [jbm]
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/binlog_tests/insert_select-binlog.test
--- 1.3/mysql-test/t/binlog_stm_mix_innodb_myisam.test 2006-08-25 19:38:00 +03:00
+++ 1.4/mysql-test/t/binlog_stm_mix_innodb_myisam.test 2006-08-25 19:38:00 +03:00
@@ -1,7 +1,7 @@
# This is a wrapper for binlog.test so that the same test case can be used
# For both statement and row based bin logs 9/19/2005 [jbm]
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/binlog_tests/mix_innodb_myisam_binlog.test
# This piece below cannot be put into
--- 1.2/mysql-test/t/ctype_cp932_binlog_stm.test 2006-08-25 19:38:00 +03:00
+++ 1.3/mysql-test/t/ctype_cp932_binlog_stm.test 2006-08-25 19:38:00 +03:00
@@ -1,7 +1,7 @@
# This is a wrapper for binlog.test so that the same test case can be used
# For both statement and row based bin logs 11/07/2005 [jbm]
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/binlog_tests/ctype_cp932_binlog.test
#
--- 1.1/mysql-test/t/rpl_stm_flsh_tbls.test 2006-08-25 19:38:00 +03:00
+++ 1.2/mysql-test/t/rpl_stm_flsh_tbls.test 2006-08-25 19:38:00 +03:00
@@ -1,5 +1,5 @@
# depends on the binlog output
---source include/have_binlog_format_statement.inc
+--source include/have_binlog_format_mixed_or_statement.inc
let $rename_event_pos= 652;
-- source extra/rpl_tests/rpl_flsh_tbls.test
--- 1.2/mysql-test/t/rpl_stm_log.test 2006-08-25 19:38:00 +03:00
+++ 1.3/mysql-test/t/rpl_stm_log.test 2006-08-25 19:38:00 +03:00
@@ -1,5 +1,5 @@
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
let $engine_type=MyISAM;
-- source extra/rpl_tests/rpl_log.test
--- 1.1/mysql-test/t/rpl_stm_max_relay_size.test 2006-08-25 19:38:00 +03:00
+++ 1.2/mysql-test/t/rpl_stm_max_relay_size.test 2006-08-25 19:38:00 +03:00
@@ -4,7 +4,7 @@
# Test of manual relay log rotation with FLUSH LOGS.
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/rpl_tests/rpl_max_relay_size.test
# End of 4.1 tests
--- 1.1/mysql-test/t/rpl_stm_multi_query.test 2006-08-25 19:38:00 +03:00
+++ 1.2/mysql-test/t/rpl_stm_multi_query.test 2006-08-25 19:38:00 +03:00
@@ -4,7 +4,7 @@
# one binlog event containing all queries)
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/rpl_tests/rpl_multi_query.test
--- 1.1/mysql-test/t/rpl_stm_no_op.test 2006-08-25 19:38:00 +03:00
+++ 1.2/mysql-test/t/rpl_stm_no_op.test 2006-08-25 19:38:00 +03:00
@@ -4,7 +4,7 @@
# case. So this test is meaningul only in statement-based (and if it was
# enabled in row-based, it would fail as expected).
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
source include/master-slave.inc;
--- 1.1/mysql-test/t/rpl_stm_reset_slave.test 2006-08-25 19:38:00 +03:00
+++ 1.2/mysql-test/t/rpl_stm_reset_slave.test 2006-08-25 19:38:00 +03:00
@@ -1,5 +1,5 @@
# TBF - difference in row level logging
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/rpl_tests/rpl_reset_slave.test
# End of 4.1 tests
--- 1.2/mysql-test/r/rpl_rbr_to_sbr.result 2006-08-25 19:38:00 +03:00
+++ 1.3/mysql-test/r/rpl_rbr_to_sbr.result 2006-08-25 19:38:00 +03:00
@@ -5,9 +5,6 @@
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
SET BINLOG_FORMAT=MIXED;
-SELECT @@GLOBAL.BINLOG_FORMAT, @@SESSION.BINLOG_FORMAT;
-@@GLOBAL.BINLOG_FORMAT @@SESSION.BINLOG_FORMAT
-STATEMENT MIXED
SET GLOBAL BINLOG_FORMAT=MIXED;
SELECT @@GLOBAL.BINLOG_FORMAT, @@SESSION.BINLOG_FORMAT;
@@GLOBAL.BINLOG_FORMAT @@SESSION.BINLOG_FORMAT
--- 1.3/mysql-test/t/rpl_rbr_to_sbr.test 2006-08-25 19:38:00 +03:00
+++ 1.4/mysql-test/t/rpl_rbr_to_sbr.test 2006-08-25 19:38:00 +03:00
@@ -1,12 +1,11 @@
-- source include/have_row_based.inc
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/master-slave.inc
# Test that the slave temporarily switches to ROW when seeing binrow
# events when it is in STATEMENT or MIXED mode
SET BINLOG_FORMAT=MIXED;
-SELECT @@GLOBAL.BINLOG_FORMAT, @@SESSION.BINLOG_FORMAT;
SET GLOBAL BINLOG_FORMAT=MIXED;
SELECT @@GLOBAL.BINLOG_FORMAT, @@SESSION.BINLOG_FORMAT;
--- 1.8/mysql-test/t/rpl_trigger.test 2006-08-25 19:38:00 +03:00
+++ 1.9/mysql-test/t/rpl_trigger.test 2006-08-25 19:38:00 +03:00
@@ -2,7 +2,7 @@
# Test of triggers with replication
# Adding statement include due to Bug 12574
# TODO: Remove statement include once 12574 is patched
---source include/have_binlog_format_statement.inc
+--source include/have_binlog_format_mixed_or_statement.inc
--source include/master-slave.inc
--disable_warnings
--- 1.12/mysql-test/t/ndb_multi.test 2006-08-25 19:38:00 +03:00
+++ 1.13/mysql-test/t/ndb_multi.test 2006-08-25 19:38:00 +03:00
@@ -1,7 +1,7 @@
-- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/not_embedded.inc
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
--disable_warnings
connection server2;
--- 1.3/mysql-test/t/rpl_trunc_temp.test 2006-08-25 19:38:00 +03:00
+++ 1.4/mysql-test/t/rpl_trunc_temp.test 2006-08-25 19:38:00 +03:00
@@ -1,5 +1,5 @@
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
source include/master-slave.inc;
--- 1.46/mysql-test/extra/rpl_tests/rpl_stm_000001.test 2006-08-25 19:38:01 +03:00
+++ 1.47/mysql-test/extra/rpl_tests/rpl_stm_000001.test 2006-08-25 19:38:01 +03:00
@@ -1,4 +1,4 @@
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/master-slave.inc
create table t1 (word char(20) not null);
--- 1.22/mysql-test/t/rpl_mixed_ddl_dml.test 2006-08-25 19:38:01 +03:00
+++ 1.23/mysql-test/t/rpl_mixed_ddl_dml.test 2006-08-25 19:38:01 +03:00
@@ -1,7 +1,7 @@
# Mixed DDL-DML (CREATE ... SELECT ...) statements can only be
# replicated properly in statement-based replication.
# Currently statement based due to bug 12345
---source include/have_binlog_format_statement.inc
+--source include/have_binlog_format_mixed_or_statement.inc
source include/master-slave.inc;
--- 1.20/mysql-test/t/rpl_temp_table.test 2006-08-25 19:38:01 +03:00
+++ 1.21/mysql-test/t/rpl_temp_table.test 2006-08-25 19:38:01 +03:00
@@ -1,7 +1,7 @@
# drop table t1 t2 t3 are included int master-slave.inc
# meaningful only in statement-based:
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/master-slave.inc
--- 1.18/mysql-test/t/rpl000013.test 2006-08-25 19:38:01 +03:00
+++ 1.19/mysql-test/t/rpl000013.test 2006-08-25 19:38:01 +03:00
@@ -7,7 +7,7 @@
# in row-based, it hangs waiting for an offset which is never
# reached (the "sync_with_master 1"), logically.
---source include/have_binlog_format_statement.inc
+--source include/have_binlog_format_mixed_or_statement.inc
source include/master-slave.inc;
save_master_pos;
connection slave;
--- 1.66/mysql-test/t/rpl_rotate_logs.test 2006-08-25 19:38:01 +03:00
+++ 1.67/mysql-test/t/rpl_rotate_logs.test 2006-08-25 19:38:01 +03:00
@@ -13,7 +13,7 @@
# - Test creating a duplicate key error and recover from it
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
--disable_warnings
--- 1.9/mysql-test/t/rpl_stm_mystery22.test 2006-08-25 19:38:01 +03:00
+++ 1.10/mysql-test/t/rpl_stm_mystery22.test 2006-08-25 19:38:01 +03:00
@@ -15,7 +15,7 @@
#should proceed in a correct way.
#################################
--- source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/master-slave.inc
# first, cause a duplicate key problem on the slave
--- 1.11/mysql-test/r/binlog_stm_binlog.result 2006-08-25 19:38:01 +03:00
+++ 1.12/mysql-test/r/binlog_stm_binlog.result 2006-08-25 19:38:01 +03:00
@@ -172,8 +172,10 @@
master-bin.000001 # Query 1 # use `test`; insert into t1 values(null)
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
-master-bin.000001 # Query 1 # use `test`; insert delayed into t1 values (207)
-master-bin.000001 # Intvar 1 # INSERT_ID=208
-master-bin.000001 # Query 1 # use `test`; insert delayed into t1 values (null)
-master-bin.000001 # Query 1 # use `test`; insert delayed into t1 values (300)
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Table_map 1 # table_id: # (test.t1)
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
drop table t1;
--- 1.11/mysql-test/extra/binlog_tests/binlog.test 2006-08-25 19:38:01 +03:00
+++ 1.12/mysql-test/extra/binlog_tests/binlog.test 2006-08-25 19:38:01 +03:00
@@ -60,24 +60,4 @@
select * from t1;
drop table t1;
-# Test of binlogging of INSERT_ID with INSERT DELAYED
-create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
-# First, avoid BUG#20627:
-set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
-# Verify that only one INSERT_ID event is binlogged.
-insert delayed into t1 values (207);
-
-# We use sleeps between statements, that's the only way to get a
-# repeatable binlog in a normal test run and under Valgrind.
-# It may be that the "binlog missing rows" of BUG#20821 shows up
-# here.
-sleep 2;
-insert delayed into t1 values (null);
-sleep 2;
-insert delayed into t1 values (300);
-sleep 2; # time for the delayed queries to reach disk
-select * from t1;
---replace_column 2 # 5 #
---replace_regex /table_id: [0-9]+/table_id: #/
-show binlog events from 102;
-drop table t1;
+-- source extra/binlog_tests/binlog_insert_delayed.test
| Thread |
|---|
| • bk commit into 5.1 tree (aelkin:1.2251) | Andrei Elkin | 25 Aug |
