diff options
| author | joerg@trift2. <> | 2006-10-24 12:04:14 +0200 |
|---|---|---|
| committer | joerg@trift2. <> | 2006-10-24 12:04:14 +0200 |
| commit | 6e2d52066e9cb4d46b0b5989675bf7cc9d4fff37 (patch) | |
| tree | 9ecf3f106258cb71a162bf619e940514095a7ba9 | |
| parent | 67ec8be645495eadc9c67a1249b615f11c12c3d7 (diff) | |
| parent | d65efaa0510ea1cac75086ea5a0fe349f22f6a14 (diff) | |
| download | mariadb-git-6e2d52066e9cb4d46b0b5989675bf7cc9d4fff37.tar.gz | |
Merge mysqldev@production.mysql.com:my/mysql-5.0-enterprise
into trift2.:/MySQL/M50/clone-5.0
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | include/mysql.h | 6 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 7bc4fe77675..18c08722fff 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.26) +AM_INIT_AUTOMAKE(mysql, 5.0.28) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=26 +NDB_VERSION_BUILD=28 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? diff --git a/include/mysql.h b/include/mysql.h index ae4a8222c5b..8ef3f1273ec 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -293,12 +293,6 @@ typedef struct st_mysql /* needed for embedded server - no net buffer to store the 'info' */ char *info_buffer; #endif - /* - In embedded server it points to the statement that is processed - in the current query. We store some results directly in statement - fields then. - */ - struct st_mysql_stmt *current_stmt; } MYSQL; typedef struct st_mysql_res { diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 40966be46a5..98c75dfe719 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -100,7 +100,6 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, mysql->affected_rows= ~(my_ulonglong) 0; mysql->field_count= 0; net->last_errno= 0; - mysql->current_stmt= stmt; thd->store_globals(); // Fix if more than one connect /* |