From 0670af9479fe8ee946f50a25b5955fc2a6aa0182 Mon Sep 17 00:00:00 2001 From: "df@pippilotta.erinye.com" <> Date: Mon, 27 Aug 2007 11:38:32 +0200 Subject: [PATCH 1/7] adjust version number --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 1dff42cbfb1..f0b7089f968 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.48) +AM_INIT_AUTOMAKE(mysql, 5.0.50) AM_CONFIG_HEADER([include/config.h:config.h.in]) 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=48 +NDB_VERSION_BUILD=50 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? From aab055a485b21666e574a23cea4de59d602147f2 Mon Sep 17 00:00:00 2001 From: "df@pippilotta.erinye.com" <> Date: Tue, 28 Aug 2007 15:22:14 +0200 Subject: [PATCH 2/7] build fix for aix and others --- libmysql/libmysql.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 85c56a7ea40..1c82a5152b4 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4681,14 +4681,14 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) MYSQL_ROWS *cur, **prev_ptr= &result->data; NET *net; + DBUG_ENTER("cli_read_binary_rows"); + if (!mysql) { set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate); - return 1; + DBUG_RETURN(1); } - DBUG_ENTER("cli_read_binary_rows"); - net = &mysql->net; mysql= mysql->last_used_con; From bc4e9689815e4d4f4cc41bc11ab48cead60b707f Mon Sep 17 00:00:00 2001 From: "df@pippilotta.erinye.com" <> Date: Tue, 28 Aug 2007 16:06:08 +0200 Subject: [PATCH 3/7] fix bug in test case for bug#25714 --- mysql-test/include/have_bug25714.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/include/have_bug25714.inc b/mysql-test/include/have_bug25714.inc index 0c995cd0d4c..0c09ae1a035 100644 --- a/mysql-test/include/have_bug25714.inc +++ b/mysql-test/include/have_bug25714.inc @@ -3,5 +3,5 @@ # --require r/have_bug25714.require disable_query_log; -eval select LENGTH("MYSQL_BUG25714") > 0 as "have_bug25714_exe"; +eval select LENGTH("$MYSQL_BUG25714") > 0 as "have_bug25714_exe"; enable_query_log; From cf285315ebb64789e914ee99539deba99ad826f5 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com/kent-amd64.(none)" <> Date: Wed, 29 Aug 2007 22:24:11 +0200 Subject: [PATCH 4/7] mysql_config.sh: Flag changed name in icc 10 --- scripts/mysql_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 1fcad16affb..addc3a10474 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -122,7 +122,7 @@ done cflags=`echo "$cflags"|sed -e 's/ *\$//'` # Same for --libs(_r) -for remove in lmtmalloc static-libcxa i-static +for remove in lmtmalloc static-libcxa i-static static-intel do # We know the strings starts with a space libs=`echo "$libs"|sed -e "s/ -$remove */ /g"` From edf772aef14ca100e4f3bea21c46948cf5da25c3 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com/kent-amd64.(none)" <> Date: Wed, 29 Aug 2007 22:29:07 +0200 Subject: [PATCH 5/7] CMakeLists.txt: Link with library "udf_example" depends on, needed for nmake libmysql.c: DBUG_ENTER need to be in declaration section --- libmysql/libmysql.c | 3 +-- sql/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 85c56a7ea40..2bf899b63e3 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4680,6 +4680,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) MYSQL_DATA *result= &stmt->result; MYSQL_ROWS *cur, **prev_ptr= &result->data; NET *net; + DBUG_ENTER("cli_read_binary_rows"); if (!mysql) { @@ -4687,8 +4688,6 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) return 1; } - DBUG_ENTER("cli_read_binary_rows"); - net = &mysql->net; mysql= mysql->last_used_con; diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 0c4aeaf6043..84b042a91b1 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -145,4 +145,4 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def) ADD_DEPENDENCIES(udf_example strings) -TARGET_LINK_LIBRARIES(udf_example wsock32) +TARGET_LINK_LIBRARIES(udf_example strings wsock32) From 57dd7bc8759ee53e0611adc76e13d624d021bc82 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com/kent-amd64.(none)" <> Date: Wed, 29 Aug 2007 23:58:15 +0200 Subject: [PATCH 6/7] libmysql_r/client_settings.h libmysqld/ha_blackhole.cc Deleted BitKeeper soft links not needed --- libmysqld/ha_blackhole.cc | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 libmysqld/ha_blackhole.cc diff --git a/libmysqld/ha_blackhole.cc b/libmysqld/ha_blackhole.cc deleted file mode 100755 index e69de29bb2d..00000000000 From f3436e512ff3f1b9f154ec890e2c7ac1ee8556b3 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com/kent-amd64.(none)" <> Date: Thu, 30 Aug 2007 00:01:02 +0200 Subject: [PATCH 7/7] server-tools/instance-manager/sql_state.c server-tools/instance-manager/pack.c server-tools/instance-manager/password.c server-tools/instance-manager/net_serv.cc Deleted BitKeeper soft links not needed