From 7d3cecca0ae25abdc2943e79410a19bdde5fff54 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 16 Jul 2007 12:42:12 +0200 Subject: [PATCH 1/4] Raise version number after cloning 5.0.46 --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 5f02b5eae63..1da39ac1aa3 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 5.0.46) +AM_INIT_AUTOMAKE(mysql, 5.0.48) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=46 +NDB_VERSION_BUILD=48 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? From f3c857068dfc059d418bf20370fb5ec683a7e180 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 16 Jul 2007 16:12:05 +0200 Subject: [PATCH 2/4] Post-merge fix Disabled a test that reports Slave SQL error in warnings file. --- mysql-test/suite/rpl/t/disabled.def | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def index 6ebbd3a2f46..14102c27c17 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/t/disabled.def @@ -14,6 +14,7 @@ rpl_ddl : BUG#26418 2007-03-01 mleich Slave out of sync after C rpl_innodb_mixed_ddl : Bug #29363 rpl.rpl_innodb_mixed_* test failures rpl_innodb_mixed_dml : Bug #29363 rpl.rpl_innodb_mixed_* test failures rpl_invoked_features : BUG#29020 2007-06-21 Lars Non-deterministic test case +rpl_auto_increment_11932 : Bug#29809 2007-07-16 ingo Slave SQL errors in warnings file rpl_deadlock_innodb : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file rpl_extraCol_innodb : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file rpl_extraCol_myisam : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file From 6e3d4f1c9844997c1a051efb8986698856410b4a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 17 Jul 2007 09:25:01 +0200 Subject: [PATCH 3/4] Post-merge fixes Disabled test cases that produce errors in a "server log". mysql-test/t/disabled.def: Post-merge fixes Removed 'binlog_innodb' from the wrong disabled.def file. --- mysql-test/suite/binlog/t/disabled.def | 14 ++++++++++++++ mysql-test/t/disabled.def | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 mysql-test/suite/binlog/t/disabled.def diff --git a/mysql-test/suite/binlog/t/disabled.def b/mysql-test/suite/binlog/t/disabled.def new file mode 100644 index 00000000000..76eeb5b00ef --- /dev/null +++ b/mysql-test/suite/binlog/t/disabled.def @@ -0,0 +1,14 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# : BUG# +# +# Do not use any TAB characters for whitespace. +# +############################################################################## + +binlog_innodb : Bug#29806 2007-07-15 ingo master.err: InnoDB: Error: MySQL is freeing a thd +binlog_killed : Bug#29806 2007-07-17 ingo master.err: InnoDB: Error: MySQL is freeing a thd diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index b994561116d..d253b4b51e2 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -25,5 +25,4 @@ ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Do mysql_upgrade : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage federated_innodb : Bug#29522 failed assertion in binlog_close_connection() -binlog_innodb : Bug#29806 2007-07-15 ingo master.err: InnoDB: Error: MySQL is freeing a thd innodb_mysql : Bug#29807 2007-07-15 ingo master.err: Cannot find table test/t2 from the internal data dictionary From cc533adf9cd6b1325a346c9d5c90ace6487a3ff1 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 17 Jul 2007 09:52:55 +0200 Subject: [PATCH 4/4] Disabled a test case that reports an error on OSX. --- mysql-test/t/disabled.def | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index d253b4b51e2..3576f1dbc23 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -26,3 +26,4 @@ ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Do mysql_upgrade : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage federated_innodb : Bug#29522 failed assertion in binlog_close_connection() innodb_mysql : Bug#29807 2007-07-15 ingo master.err: Cannot find table test/t2 from the internal data dictionary +lowercase_table3 : Bug#29839 2007-07-17 ingo Cannot find table test/T1 from the internal data dictionary