From 49411edb69cd5ad26bd48850ce4637fda7659a34 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Thu, 28 Aug 2008 16:16:06 +0300 Subject: [PATCH 1/2] on behalf of jasonh : fix of a test problem re bug#37051: Wait for slave to stop before set skip counter --- mysql-test/include/wait_for_slave_sql_error_and_skip.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc index ef17ffed12f..4b4776d2923 100644 --- a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc +++ b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc @@ -17,6 +17,9 @@ if ($show_sql_error) echo Last_SQL_Error = $error; } +# wait for SQL thread to stop after the error +source include/wait_for_slave_sql_to_stop.inc; + # skip the erroneous statement set global sql_slave_skip_counter=1; start slave; From 86af3f63ff9be54c1d4b27d2b38d4a540bcaf988 Mon Sep 17 00:00:00 2001 From: mysqldev Date: Thu, 28 Aug 2008 16:16:43 +0200 Subject: [PATCH 2/2] Added "-rc" to the release number --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 56bdb4ba006..dacd3864e6a 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM # # When changing major version number please also check switch statement # in mysqlbinlog::check_master_version(). -AM_INIT_AUTOMAKE(mysql, 5.1.28) +AM_INIT_AUTOMAKE(mysql, 5.1.28-rc) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10