summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2005-02-10 18:24:26 +0300
committerunknown <konstantin@mysql.com>2005-02-10 18:24:26 +0300
commitd9039e8718d9268297568bb996f1b0672db94ae4 (patch)
tree3369b364e8820a73ef65fddf66b3540b83d8dad8 /libmysql
parenta26ce94f7adf0fb992045dfdf9d9401a36a6c31c (diff)
downloadmariadb-git-d9039e8718d9268297568bb996f1b0672db94ae4.tar.gz
Follow-up for bug#7990
libmysql/libmysql.c: And now put it to the proper place and make it work (Bug#7990) tests/mysql_client_test.c: Enable the test for bug#7990
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 76cf5c3913c..9c49c7eb15b 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -4518,17 +4518,17 @@ my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt)
if (mysql)
{
mysql->stmts= list_delete(mysql->stmts, &stmt->list);
+ /*
+ Clear NET error state: if the following commands come through
+ successfully, connection will still be usable for other commands.
+ */
+ net_clear_error(&mysql->net);
if ((int) stmt->state > (int) MYSQL_STMT_INIT_DONE)
{
char buff[MYSQL_STMT_HEADER]; /* 4 bytes - stmt id */
if (mysql->unbuffered_fetch_owner == &stmt->unbuffered_fetch_cancelled)
mysql->unbuffered_fetch_owner= 0;
- /*
- Clear NET error state: if the following commands come through
- successfully, connection will still be usable for other commands.
- */
- net_clear_error(&mysql->net);
if (mysql->status != MYSQL_STATUS_READY)
{
/*