diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 16:09:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 16:09:42 +0300 |
| commit | 47119a2219ec484c305fcea0c6b437cb66bbd8b8 (patch) | |
| tree | 110fefc8ad5fd0d9e5bf30e25e7a7b1c52212e96 /sql/sql_parse.cc | |
| parent | 153cd6a27f1b798fea6dee3aecf3a95df561c6fa (diff) | |
| parent | 66ec3a770f7854f500ece66c78f3c87c9cd6da15 (diff) | |
| download | mariadb-git-47119a2219ec484c305fcea0c6b437cb66bbd8b8.tar.gz | |
WIP merge 10.3 into 10.4
Unresolved conflicts:
both modified: mysql-test/suite/galera/disabled.def
both modified: mysql-test/suite/galera/r/galera_var_innodb_disallow_writes.result
both modified: mysql-test/suite/galera/t/galera_var_innodb_disallow_writes.test
FIXME: crash in main.plugin
FIXME: run tests
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 9f7cf514ac3..fbfb0449989 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7916,8 +7916,8 @@ void mysql_parse(THD *thd, char *rawbuf, uint length, sp_cache_enforce_limit(thd->sp_package_spec_cache, stored_program_cache_size); sp_cache_enforce_limit(thd->sp_package_body_cache, stored_program_cache_size); thd->end_statement(); + thd->Item_change_list::rollback_item_tree_changes(); thd->cleanup_after_query(); - DBUG_ASSERT(thd->Item_change_list::is_empty()); } else { |