diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-01-24 14:42:52 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-01-24 14:42:52 +0100 |
| commit | ee8755e3c51a1da8fcf108ad0257a7e62fc94347 (patch) | |
| tree | 4086f5759bff9b6d9ee02f652e944b3ffdd0d8bc /sql/sql_prepare.cc | |
| parent | 76577e1e2602f3c30859a176808c433a263e1b0a (diff) | |
| download | mariadb-git-ee8755e3c51a1da8fcf108ad0257a7e62fc94347.tar.gz | |
MDEV-15012: ASAN: numerous test failures in PSbb-5.5-MDEV-15012
First roll back changes, then free Items which can lead to memory freeing.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index faaeaf51573..a3bf9d6c93c 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3230,9 +3230,9 @@ void Prepared_statement::cleanup_stmt() DBUG_ENTER("Prepared_statement::cleanup_stmt"); DBUG_PRINT("enter",("stmt: 0x%lx", (long) this)); + thd->rollback_item_tree_changes(); cleanup_items(free_list); thd->cleanup_after_query(); - thd->rollback_item_tree_changes(); DBUG_VOID_RETURN; } |