database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-13 13:01:51 +03:00
Code Activity

Merge mysql.com:/home/hf/work/w3475/my50-w3475

Browse Source 
into  mysql.com:/home/hf/work/w3475/my51-w3475


client/mysqltest.c:
  Auto merged
BitKeeper/deleted/.del-bdb-deadlock.test:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/include/deadlock.inc:
  SCCS merged
This commit is contained in:
unknown
2006-10-24 15:43:10 +05:00
parent 9852dfbcf5 cc19246f58
commit 0eb21ee474
9 changed files with 83 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libmysql/libmysql.c
View File

@ -4763,14 +4763,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)
{
/*