Merge mysql.com:/home/hf/work/29687/my50-29687
into mysql.com:/home/hf/work/29687/my51-29687
This commit is contained in:
commit
a49bc17fe8
@ -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));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user