diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-08 22:54:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-08 22:54:24 +0200 |
| commit | 82e9f6d948132b71abd57d8413f97f0cc2208d82 (patch) | |
| tree | 3ab146f819af46d42d93be133cea16b66ff5df7f /sql/sql_table.cc | |
| parent | c8d511293aae155210089b6de4143d11569af18d (diff) | |
| parent | b9768521bdeb1a8069c7b871f4536792b65fd79b (diff) | |
| download | mariadb-git-82e9f6d948132b71abd57d8413f97f0cc2208d82.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 4139aa7d955..6e589e2b8d4 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4010,6 +4010,12 @@ static bool check_if_created_table_can_be_opened(THD *thd, result= (open_table_def(thd, &share, 0) || open_table_from_share(thd, &share, "", 0, (uint) READ_ALL, 0, &table, TRUE)); + /* + Assert that the change list is empty as no partition function currently + needs to modify item tree. May need call THD::rollback_item_tree_changes + later before calling closefrm if the change list is not empty. + */ + DBUG_ASSERT(thd->change_list.is_empty()); if (! result) (void) closefrm(&table, 0); |