diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-29 16:32:59 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-29 16:32:59 +0200 |
| commit | a5fcced7d1509cb1d5c1c2a6697047d8c124c260 (patch) | |
| tree | 2913f1891f5935c0b705392f33693ff4d1090110 /sql/sql_prepare.cc | |
| parent | 706ed8552dbfd147c72d34b63e7de79a9fbedad3 (diff) | |
| parent | 547ec8ce27c9035e2f0a823866a7e4ed1b02d4c8 (diff) | |
| download | mariadb-git-a5fcced7d1509cb1d5c1c2a6697047d8c124c260.tar.gz | |
Merge 5.5 into 10.0
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 2d05d513173..6a0f89aa7b7 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3269,9 +3269,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; } |