From adb1d7a32787e1e5c40a739b9f2e990e67ba946f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 26 Sep 2007 19:15:42 +0200 Subject: [PATCH 1/2] Raise version number after cloning 5.0.50 --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index f0b7089f968..d27c77d49b1 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.50) +AM_INIT_AUTOMAKE(mysql, 5.0.52) 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=50 +NDB_VERSION_BUILD=52 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? From d63f8305d86dff044def5c35168c4ae8c6a86fd9 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 27 Sep 2007 08:48:39 +0200 Subject: [PATCH 2/2] Move DBUG_ENTER to begining of function to avoid build failure with debug on windows --- libmysql/libmysql.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 85c56a7ea40..14b1a682b49 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_ENTER("cli_read_binary_rows"); - net = &mysql->net; mysql= mysql->last_used_con;