database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge mysql.com:/home/kostja/work/mysql-4.1-root

Browse Source 
into mysql.com:/home/kostja/work/mysql-5.0-root


libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
This commit is contained in:
unknown
2005-02-10 17:53:06 +03:00
parent bebba9582f a26ce94f7a
commit 98bc234830
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libmysql/libmysql.c
View File

@ -1809,6 +1809,18 @@ static my_bool my_realloc_str(NET *net, ulong length)
}
/* Clear possible error statee of struct NET */
static void net_clear_error(NET *net)
{
if (net->last_errno)
{
net->last_errno= 0;
net->last_error[0]= '\0';
strmov(net->sqlstate, not_error_sqlstate);
}
}
/*
Set statement error code, sqlstate, and error message
from given errcode and sqlstate.
@ -4869,6 +4881,11 @@ my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt)
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)
{
/*