diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 17:34:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 17:34:49 +0300 |
| commit | a3539bbb2ac51dfa2b363d3b4c11784c25d1f256 (patch) | |
| tree | 6b49da1f15e5740adaf5da1c4179760a15b77dc4 /sql/sql_alter.cc | |
| parent | c98e6d4b3d4d17ee429c696ac07e0bc4bbe1a81e (diff) | |
| parent | 6f96ff7268dd20d6d3b61931c972e7a43c1efdff (diff) | |
| download | mariadb-git-a3539bbb2ac51dfa2b363d3b4c11784c25d1f256.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_alter.cc')
| -rw-r--r-- | sql/sql_alter.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index 0825e9754ad..bf78bd12192 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -402,8 +402,8 @@ bool Sql_cmd_alter_table::execute(THD *thd) - For temporary MERGE tables we do not track if their child tables are base or temporary. As result we can't guarantee that privilege check - which was done in presence of temporary child will stay relevant later - as this temporary table might be removed. + which was done in presence of temporary child will stay relevant + later as this temporary table might be removed. If SELECT_ACL | UPDATE_ACL | DELETE_ACL privileges were not checked for the underlying *base* tables, it would create a security breach as in @@ -443,6 +443,9 @@ bool Sql_cmd_alter_table::execute(THD *thd) create_info.data_file_name= create_info.index_file_name= NULL; thd->prepare_logs_for_admin_command(); +#ifdef WITH_PARTITION_STORAGE_ENGINE + thd->work_part_info= 0; +#endif #ifdef WITH_WSREP if ((!thd->is_current_stmt_binlog_format_row() || |