database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix for mysql_stmt_close(), so that the PHP layer can map it easily to know whether the 'stmt' is really freed, so that they can free their internal stmts

Browse Source
This commit is contained in:
unknown
2003-02-21 15:00:05 -08:00
parent f14222f252
commit c9a50805a1
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libmysql/libmysql.c
View File

@ -5430,12 +5430,15 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt)
static my_bool stmt_close(MYSQL_STMT *stmt, my_bool skip_list) static my_bool stmt_close(MYSQL_STMT *stmt, my_bool skip_list)
{ {
MYSQL *mysql; MYSQL *mysql;
my_bool error= 0;
DBUG_ENTER("mysql_stmt_close"); DBUG_ENTER("mysql_stmt_close");
DBUG_ASSERT(stmt != 0); DBUG_ASSERT(stmt != 0);
mysql= stmt->mysql; if (!(mysql= stmt->mysql))
{
my_free((gptr) stmt, MYF(MY_WME));
DBUG_RETURN(0);
}
if (mysql->status != MYSQL_STATUS_READY) if (mysql->status != MYSQL_STATUS_READY)
{ {
/* Clear the current execution status */ /* Clear the current execution status */
@ -5454,18 +5457,20 @@ static my_bool stmt_close(MYSQL_STMT *stmt, my_bool skip_list)
{ {
char buff[4]; char buff[4];
int4store(buff, stmt->stmt_id); int4store(buff, stmt->stmt_id);
error= simple_command(mysql, COM_CLOSE_STMT, buff, 4, 1); if (simple_command(mysql, COM_CLOSE_STMT, buff, 4, 1))
{
set_stmt_errmsg(stmt, mysql->net.last_error, mysql->net.last_errno);
stmt->mysql= NULL; /* connection isn't valid anymore */
DBUG_RETURN(1);
}
} }
if (!error) mysql_free_result(stmt->result);
{ free_root(&stmt->mem_root, MYF(0));
mysql_free_result(stmt->result); if (!skip_list)
free_root(&stmt->mem_root, MYF(0)); mysql->stmts= list_delete(mysql->stmts, &stmt->list);
if (!skip_list) mysql->status= MYSQL_STATUS_READY;
mysql->stmts= list_delete(mysql->stmts, &stmt->list); my_free((gptr) stmt, MYF(MY_WME));
mysql->status= MYSQL_STATUS_READY; DBUG_RETURN(0);
my_free((gptr) stmt, MYF(MY_WME));
}
DBUG_RETURN(error);
} }
my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt) my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt)