Commit ee8755e3 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

MDEV-15012: ASAN: numerous test failures in PS

First roll back changes, then free Items which can lead to memory freeing.
parent 76577e1e
...@@ -3230,9 +3230,9 @@ void Prepared_statement::cleanup_stmt() ...@@ -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;
} }
......
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