mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge mysql.com:/home/kostja/work/mysql-4.1-root
into mysql.com:/home/kostja/work/mysql-5.0-root
This commit is contained in:
@ -4875,17 +4875,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)
|
||||
{
|
||||
/*
|
||||
|
Reference in New Issue
Block a user