summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorAleksey Midenkov <midenok@gmail.com>2020-06-15 19:10:39 +0300
committerAleksey Midenkov <midenok@gmail.com>2020-06-15 19:10:39 +0300
commit30d41c8102c36af7551b3ae77e48efbeb6d7ecea (patch)
tree699c0af1519ea98f9ba1f08b9c4a6d8ce08e0b6e /sql
parent359d5f56c315cbc428e96d5d2d83d5a7ba077d06 (diff)
downloadmariadb-git-30d41c8102c36af7551b3ae77e48efbeb6d7ecea.tar.gz
MDEV-22881 Unexpected errors, corrupt output, Valgrind / ASAN errors in Item_ident::print or append_identifier
After this code end_inplace: if (thd->locked_tables_list.reopen_tables(thd, false)) goto err_with_mdl_after_alter; table is not reopened (need_reopen is false) but some_table_marked_for_reopen is reset to false. Item_field is allocated on table lock and assigned new name on first ALTER which is then freed at the end of the command. Second ALTER accessess this Item_field and gets garbage value.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_base.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index d7be718b1ca..88a28c470c0 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2592,7 +2592,8 @@ Locked_tables_list::reopen_tables(THD *thd, bool need_reopen)
/* Reset flag that some table was marked for reopen */
- some_table_marked_for_reopen= 0;
+ if (need_reopen)
+ some_table_marked_for_reopen= 0;
for (TABLE_LIST *table_list= m_locked_tables;
table_list; table_list= table_list->next_global)