1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-15012: ASAN: numerous test failures in PS

Browse Source 
First roll back changes, then free Items which can lead to memory freeing.
This commit is contained in:
Oleksandr Byelkin 2018-01-24 14:42:52 +01:00
parent 76577e1e26
commit ee8755e3c5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_prepare.cc
View File

@ -3230,9 +3230,9 @@ void Prepared_statement::cleanup_stmt()
DBUG_ENTER("Prepared_statement::cleanup_stmt"); DBUG_ENTER("Prepared_statement::cleanup_stmt");
DBUG_PRINT("enter",("stmt: 0x%lx", (long) this)); DBUG_PRINT("enter",("stmt: 0x%lx", (long) this));
thd->rollback_item_tree_changes();
cleanup_items(free_list); cleanup_items(free_list);
thd->cleanup_after_query(); thd->cleanup_after_query();
thd->rollback_item_tree_changes();
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }