From fc55339e2f4ef58a1ee2841bbb5019353165c818 Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Tue, 3 Nov 2009 16:17:06 -0200 Subject: [PATCH 1/4] Fix compiler warnings -- tag unused parameters. --- libmysql/libmysql.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 92a90ba79b3..d287679bebb 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1615,12 +1615,14 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, char * STDCALL -mysql_odbc_escape_string(MYSQL *mysql, - char *to, ulong to_length, - const char *from, ulong from_length, - void *param, - char * (*extend_buffer) - (void *, char *, ulong *)) +mysql_odbc_escape_string(MYSQL *mysql __attribute__((unused)), + char *to __attribute__((unused)), + ulong to_length __attribute__((unused)), + const char *from __attribute__((unused)), + ulong from_length __attribute__((unused)), + void *param __attribute__((unused)), + char * (*extend_buffer)(void *, char *, ulong *) + __attribute__((unused))) { return NULL; } From 10ef8dd19137363a4073180c7f6ff7e3356c6e3a Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Wed, 4 Nov 2009 11:13:22 +0200 Subject: [PATCH 2/4] Disabled the rpl_killed_ddl test in 5.0 because of bug #45520 --- 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 062667c249e..7ce67d3fa89 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -25,3 +25,4 @@ loaddata_autocom_ndb : Bug#35148: Error '4009 Cluster Failure' in various tests ndb_autodiscover3 : Bug#35148: Error '4009 Cluster Failure' in various tests on various platforms ndb_autodiscover : Bug#45972: ndb.ndb_autodiscover fails occasionally with pb2 ndb_autodiscover2 : Bug#45972: ndb.ndb_autodiscover fails occasionally with pb2 +rpl_killed_ddl : Bug#45520: rpl_killed_ddl fails sporadically in pb2 From 721d739086956cdcc66f1a870612666fc2568983 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Wed, 4 Nov 2009 11:13:55 +0200 Subject: [PATCH 3/4] version change --- .bzr-mysql/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index 557df1b1ffe..f79c1cd6319 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com" -tree_name = "mysql-5.0-bugteam" +tree_name = "mysql-5.0" From c5a30828067468d08007bdb36903e411652c8e4b Mon Sep 17 00:00:00 2001 From: "hery.ramilison@sun.com" <> Date: Wed, 4 Nov 2009 19:22:09 +0100 Subject: [PATCH 4/4] Raise version number after cloning 5.1.41 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index d479088356b..fb5517659ba 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.41) +AM_INIT_AUTOMAKE(mysql, 5.1.42) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10