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

Merge bk-internal:/home/bk/mysql-5.1

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
This commit is contained in:
gkodinov@dl145s.mysql.com
2006-11-28 17:14:16 +01:00
73 changed files with 2155 additions and 322 deletions

View File

@ -4762,14 +4762,6 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt)
DBUG_RETURN(1);
}
if (result->data)
{
free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));
result->data= NULL;
result->rows= 0;
stmt->data_cursor= NULL;
}
if (stmt->update_max_length && !stmt->bind_result_done)
{
/*