Commit a49bc17f authored by holyfoot/hf@hfmain.(none)'s avatar holyfoot/hf@hfmain.(none)

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

into  mysql.com:/home/hf/work/29687/my51-29687
parents bec9500e dfc38479
...@@ -4939,7 +4939,7 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags) ...@@ -4939,7 +4939,7 @@ static my_bool reset_stmt_handle(MYSQL_STMT *stmt, uint flags)
Reset stored result set if so was requested or it's a part Reset stored result set if so was requested or it's a part
of cursor fetch. of cursor fetch.
*/ */
if (result->data && (flags & RESET_STORE_RESULT)) if (flags & RESET_STORE_RESULT)
{ {
/* Result buffered */ /* Result buffered */
free_root(&result->alloc, MYF(MY_KEEP_PREALLOC)); free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment