Below is the list of changes that have just been committed into a local
5.0 repository of ndbdev. When ndbdev 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
1.1975 05/09/19 17:14:51 jmiller@stripped +24 -0
Wrapping of binlog tests first pass
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
1.20 05/09/19 17:13:11 jmiller@stripped +1 -1
commented out include statement in to prepare to wrap test
mysql-test/extra/binlog_tests/insert_select-binlog.test
1.5 05/09/19 17:13:11 jmiller@stripped +1 -1
commented out include statement in to prepare to wrap test
mysql-test/extra/binlog_tests/drop_temp_table.test
1.10 05/09/19 17:13:11 jmiller@stripped +1 -1
commented out include statement in to prepare to wrap test
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
1.8 05/09/19 17:13:11 jmiller@stripped +1 -1
commented out include statement in to prepare to wrap test
mysql-test/extra/binlog_tests/ctype_cp932.test
1.10 05/09/19 17:13:11 jmiller@stripped +1 -1
commented out include statement in to prepare to wrap test
mysql-test/extra/binlog_tests/blackhole.test
1.7 05/09/19 17:13:11 jmiller@stripped +1 -1
commented out include statement in to prepare to wrap test
mysql-test/extra/binlog_tests/binlog.test
1.7 05/09/19 17:13:11 jmiller@stripped +1 -1
commented out include statement in to prepare to wrap test
mysql-test/r/user_var.result
1.37 05/09/19 17:06:21 jmiller@stripped +1 -1
new result file
mysql-test/t/user_var.test
1.32 05/09/19 17:05:56 jmiller@stripped +5 -1
Added comment about fix for test cases
mysql-test/t/user_var-binlog.test
1.6 05/09/19 16:58:59 jmiller@stripped +1 -1
Added back statement test
mysql-test/t/user_var-binlog.test
1.5 05/09/19 16:57:21 jmiller@stripped +2 -2
Added TODO comment
mysql-test/t/mysqlbinlog2.test
1.9 05/09/19 16:51:30 jmiller@stripped +1 -0
Added TODO comment
mysql-test/t/mysqlbinlog.test
1.22 05/09/19 16:50:12 jmiller@stripped +1 -1
Added TODO comment
mysql-test/r/binlog_stm_mix_innodb_myisam.result
1.24 05/09/19 16:24:19 jmiller@stripped +0 -0
Rename: mysql-test/r/mix_innodb_myisam_binlog.result -> mysql-test/r/binlog_stm_mix_innodb_myisam.result
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
1.19 05/09/19 16:23:29 jmiller@stripped +0 -0
Rename: mysql-test/t/mix_innodb_myisam_binlog.test -> mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
mysql-test/r/binlog_stm_insert_select.result
1.4 05/09/19 16:15:40 jmiller@stripped +0 -0
Rename: mysql-test/r/insert_select-binlog.result -> mysql-test/r/binlog_stm_insert_select.result
mysql-test/extra/binlog_tests/insert_select-binlog.test
1.4 05/09/19 16:15:02 jmiller@stripped +0 -0
Rename: mysql-test/t/insert_select-binlog.test -> mysql-test/extra/binlog_tests/insert_select-binlog.test
mysql-test/extra/binlog_tests/innodb_stat.test
1.3 05/09/19 16:12:56 jmiller@stripped +1 -1
removed statement check for test wrapping purpose
mysql-test/r/binlog_stm_innodb_stat.result
1.2 05/09/19 16:11:55 jmiller@stripped +0 -0
Rename: mysql-test/r/innodb_stat.result -> mysql-test/r/binlog_stm_innodb_stat.result
mysql-test/extra/binlog_tests/innodb_stat.test
1.2 05/09/19 16:11:15 jmiller@stripped +0 -0
Rename: mysql-test/t/innodb_stat.test -> mysql-test/extra/binlog_tests/innodb_stat.test
mysql-test/t/flush_block_commit.test
1.11 05/09/19 16:07:30 jmiller@stripped +2 -1
Removed statement based check as test passed using RBR
mysql-test/r/binlog_stm_drop_tmp_tbl.result
1.16 05/09/19 16:04:06 jmiller@stripped +0 -0
Rename: mysql-test/r/drop_temp_table.result -> mysql-test/r/binlog_stm_drop_tmp_tbl.result
mysql-test/extra/binlog_tests/drop_temp_table.test
1.9 05/09/19 16:03:21 jmiller@stripped +0 -0
Rename: mysql-test/t/drop_temp_table.test -> mysql-test/extra/binlog_tests/drop_temp_table.test
mysql-test/t/ctype_utf8.test
1.70 05/09/19 16:02:00 jmiller@stripped +2 -2
Removed statement based check as test passed using RBR
mysql-test/t/ctype_ucs.test
1.36 05/09/19 15:50:47 jmiller@stripped +2 -1
Removed statement based check as test passed using RBR
mysql-test/r/binlog_stm_ctype_ucs.result
1.4 05/09/19 15:41:58 jmiller@stripped +0 -0
Rename: mysql-test/r/ctype_ucs_binlog.result -> mysql-test/r/binlog_stm_ctype_ucs.result
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
1.7 05/09/19 15:41:13 jmiller@stripped +0 -0
Rename: mysql-test/t/ctype_ucs_binlog.test -> mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
mysql-test/r/binlog_stm_ctype_cp932.result
1.7 05/09/19 15:40:00 jmiller@stripped +0 -0
Rename: mysql-test/r/ctype_cp932.result -> mysql-test/r/binlog_stm_ctype_cp932.result
mysql-test/extra/binlog_tests/ctype_cp932.test
1.9 05/09/19 15:39:17 jmiller@stripped +0 -0
Rename: mysql-test/t/ctype_cp932.test -> mysql-test/extra/binlog_tests/ctype_cp932.test
mysql-test/r/binlog_stm_blackhole.result
1.6 05/09/19 15:36:35 jmiller@stripped +0 -0
Rename: mysql-test/r/blackhole.result -> mysql-test/r/binlog_stm_blackhole.result
mysql-test/extra/binlog_tests/blackhole.test
1.6 05/09/19 15:35:49 jmiller@stripped +0 -0
Rename: mysql-test/t/blackhole.test -> mysql-test/extra/binlog_tests/blackhole.test
mysql-test/r/binlog_stm_binlog.result
1.6 05/09/19 15:17:33 jmiller@stripped +0 -0
Rename: mysql-test/r/binlog.result -> mysql-test/r/binlog_stm_binlog.result
mysql-test/extra/binlog_tests/binlog.test
1.6 05/09/19 15:16:46 jmiller@stripped +0 -0
Rename: mysql-test/t/binlog.test -> mysql-test/extra/binlog_tests/binlog.test
# 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: jmiller
# Host: ndb08.mysql.com
# Root: /home/ndbdev/jmiller/mysql-5.0-wl1012
--- 1.35/mysql-test/t/ctype_ucs.test 2005-08-11 02:16:18 +02:00
+++ 1.36/mysql-test/t/ctype_ucs.test 2005-09-19 15:50:47 +02:00
@@ -1,5 +1,6 @@
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+# Not sure why statement was required, passed find using rbr
+#-- source include/have_binlog_format_statement.inc
-- source include/have_ucs2.inc
--- 1.69/mysql-test/t/ctype_utf8.test 2005-09-12 17:54:04 +02:00
+++ 1.70/mysql-test/t/ctype_utf8.test 2005-09-19 16:02:00 +02:00
@@ -1,8 +1,8 @@
#
# Tests with the utf8 character set
#
-
--- source include/have_binlog_format_statement.inc
+# Shows to pass using row based binlog in latest wl1012 clone[jbm]
+#-- source include/have_binlog_format_statement.inc
--disable_warnings
drop table if exists t1,t2;
--- 1.5/mysql-test/t/blackhole.test 2005-08-11 02:16:18 +02:00
+++ 1.7/mysql-test/extra/binlog_tests/blackhole.test 2005-09-19 17:13:11 +02:00
@@ -8,7 +8,7 @@
# The test is dependent on statement-based logging since it uses SHOW
# BINLOG EVENTS below.
#
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
--disable_warnings
drop table if exists t1,t2;
--- 1.21/mysql-test/t/mysqlbinlog.test 2005-09-16 13:12:00 +02:00
+++ 1.22/mysql-test/t/mysqlbinlog.test 2005-09-19 16:50:12 +02:00
@@ -1,5 +1,5 @@
# 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
# Embedded server doesn't support binlogging
--- 1.8/mysql-test/t/drop_temp_table.test 2005-09-16 13:12:00 +02:00
+++ 1.10/mysql-test/extra/binlog_tests/drop_temp_table.test 2005-09-19 17:13:11 +02:00
@@ -1,5 +1,5 @@
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
--- 1.10/mysql-test/t/flush_block_commit.test 2005-09-16 13:12:00 +02:00
+++ 1.11/mysql-test/t/flush_block_commit.test 2005-09-19 16:07:30 +02:00
@@ -4,7 +4,8 @@
# This is intended to mimick how mysqldump and innobackup work.
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
+# Passed using row based bin log format with latest wl1012 clone [jbm]
# This test doesn't work with the embedded server
-- source include/not_embedded.inc
--- 1.18/mysql-test/t/mix_innodb_myisam_binlog.test 2005-09-16 13:12:00 +02:00
+++ 1.20/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 2005-09-19 17:13:11 +02:00
@@ -5,7 +5,7 @@
# did some tests manually on a slave; tables are replicated fine and
# Exec_Master_Log_Pos advances as expected.
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
--- 1.8/mysql-test/t/mysqlbinlog2.test 2005-08-11 02:16:20 +02:00
+++ 1.9/mysql-test/t/mysqlbinlog2.test 2005-09-19 16:51:30 +02:00
@@ -1,6 +1,7 @@
# Test for the new options --start-datetime, stop-datetime,
# 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
# Embedded server doesn't support binlogging
--- 1.6/mysql-test/t/ctype_ucs_binlog.test 2005-08-11 02:16:18 +02:00
+++ 1.8/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test 2005-09-19 17:13:11 +02:00
@@ -1,5 +1,5 @@
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
--source include/not_embedded.inc
--source include/have_ucs2.inc
--- 1.3/mysql-test/t/insert_select-binlog.test 2005-08-11 02:16:19 +02:00
+++ 1.5/mysql-test/extra/binlog_tests/insert_select-binlog.test 2005-09-19 17:13:11 +02:00
@@ -1,5 +1,5 @@
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
--- 1.4/mysql-test/t/user_var-binlog.test 2005-08-11 02:16:25 +02:00
+++ 1.6/mysql-test/t/user_var-binlog.test 2005-09-19 16:58:59 +02:00
@@ -1,6 +1,6 @@
# Requires statement logging
-- source include/have_binlog_format_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/innodb_stat.test 2005-07-25 12:48:07 +02:00
+++ 1.3/mysql-test/extra/binlog_tests/innodb_stat.test 2005-09-19 16:12:56 +02:00
@@ -1,5 +1,5 @@
-- source include/have_innodb.inc
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
#
# Let us test binlog_cache_use and binlog_cache_disk_use status vars.
--- 1.36/mysql-test/r/user_var.result 2005-08-11 02:16:18 +02:00
+++ 1.37/mysql-test/r/user_var.result 2005-09-19 17:06:21 +02:00
@@ -1,6 +1,6 @@
drop table if exists t1,t2;
set @a := foo;
-ERROR 42S22: Unknown column 'foo' in 'order clause'
+ERROR 42S22: Unknown column 'foo' in 'field list'
set @a := connection_id() + 3;
select @a - connection_id();
@a - connection_id()
--- 1.31/mysql-test/t/user_var.test 2005-08-11 02:16:25 +02:00
+++ 1.32/mysql-test/t/user_var.test 2005-09-19 17:05:56 +02:00
@@ -1,5 +1,9 @@
# Requires statement logging
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
+# This test was failing due to error format change
+# - old = ERROR 42S22: Unknown column 'foo' in 'order clause'
+# - new = ERROR 42S22: Unknown column 'foo' in 'field list'
+# Now passes both row and statement based
# Initialise
--disable_warnings
--- 1.5/mysql-test/t/binlog.test 2005-07-25 12:47:59 +02:00
+++ 1.7/mysql-test/extra/binlog_tests/binlog.test 2005-09-19 17:13:11 +02:00
@@ -1,7 +1,7 @@
#
# misc binlogging tests that do not require a slave running
#
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
-- source include/have_bdb.inc
-- source include/have_innodb.inc
--- 1.8/mysql-test/t/ctype_cp932.test 2005-08-27 23:31:54 +02:00
+++ 1.10/mysql-test/extra/binlog_tests/ctype_cp932.test 2005-09-19 17:13:11 +02:00
@@ -1,5 +1,5 @@
# show binlog events used
--- source include/have_binlog_format_statement.inc
+#-- source include/have_binlog_format_statement.inc
-- source include/have_cp932.inc
--character_set cp932
| Thread |
|---|
| • bk commit into 5.0 tree (jmiller:1.1975) | Jonathan Miller | 19 Sep |
