diff options
| author | unknown <mmj@tiger.local[mmj]> | 2006-10-24 19:05:11 +0200 |
|---|---|---|
| committer | unknown <mmj@tiger.local[mmj]> | 2006-10-24 19:05:11 +0200 |
| commit | b4be62323f39969bd952696ce69f829a08e9cf5d (patch) | |
| tree | 132f98a1af20657d0af2f1a645155d2f6d291c28 | |
| parent | ac659aeef1c03552a9da4fc310e8486c98591a1f (diff) | |
| download | mariadb-git-b4be62323f39969bd952696ce69f829a08e9cf5d.tar.gz | |
Bug #23427: incompatible ABI change in 5.0.26?mysql-5.1.12
Revert 1 June change enough to restore ABI compatibility with previous
versions.
include/mysql.h:
Revert patch that breaks ABI compatibility
libmysqld/lib_sql.cc:
Remove useless assignment.
| -rw-r--r-- | include/mysql.h | 6 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 1 |
2 files changed, 0 insertions, 7 deletions
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 5ac2c163c4e..b5efd4a82af 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 /* |