diff options
| author | unknown <konstantin@mysql.com> | 2006-02-02 18:17:18 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-02 18:17:18 +0300 |
| commit | 95a3509a6637699fdcc26d7042013778c5e55d08 (patch) | |
| tree | 336ed0f3ebd53f06d2b14904f4fd937b5fe487c6 /libmysql | |
| parent | 9b3e6c27b0615270042cff92c88cb338ded9b69f (diff) | |
| parent | 1e686ae7702d297cc9fd261c42864653f4fdd7b3 (diff) | |
| download | mariadb-git-95a3509a6637699fdcc26d7042013778c5e55d08.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
BitKeeper/deleted/.del-rpl_ignore_table.result:
Delete: mysql-test/r/rpl_ignore_table.result
BitKeeper/deleted/.del-rpl_multi_update4.result:
Delete: mysql-test/r/rpl_multi_update4.result
BitKeeper/deleted/.del-rpl_ignore_table-slave.opt:
Delete: mysql-test/t/rpl_ignore_table-slave.opt
BitKeeper/deleted/.del-rpl_ignore_table.test:
Delete: mysql-test/t/rpl_ignore_table.test
BitKeeper/deleted/.del-rpl_multi_update4-slave.opt:
Delete: mysql-test/t/rpl_multi_update4-slave.opt
BitKeeper/deleted/.del-disabled.def:
Auto merged
BitKeeper/deleted/.del-rpl_multi_update4.test:
Delete: mysql-test/t/rpl_multi_update4.test
heap/hp_create.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/update.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/kill.test:
Auto merged
mysql-test/t/update.test:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
configure.in:
Manual merge.
libmysql/libmysql.c:
Manual merge.
mysql-test/r/heap.result:
Manual merge.
mysql-test/r/heap_hash.result:
Manual merge.
mysql-test/r/kill.result:
Manual merge.
sql/ha_heap.cc:
Manual merge.
sql/ha_heap.h:
Manual merge.
sql/item_timefunc.cc:
Manual merge.
sql/sql_class.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_update.cc:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index be1a3a1fe5f..9825f1ecdfa 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -5036,6 +5036,12 @@ my_bool STDCALL mysql_stmt_reset(MYSQL_STMT *stmt) { DBUG_ENTER("mysql_stmt_reset"); DBUG_ASSERT(stmt != 0); + if (!stmt->mysql) + { + /* mysql can be reset in mysql_close called from mysql_reconnect */ + set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate); + DBUG_RETURN(1); + } /* Reset the client and server sides of the prepared statement */ DBUG_RETURN(reset_stmt_handle(stmt, RESET_SERVER_SIDE | RESET_LONG_DATA)); } |