summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-01-23 23:48:57 +0200
committerMonty <monty@mariadb.org>2018-01-24 00:09:34 +0200
commitd0acfa458ef10ef46afee7ca81bfad3064026d38 (patch)
tree39f8ed3433f5df380290a49c89cc7f80ee64f59a /sql
parentd5d0c62459183f27fa0de10b518ace3301c6a6ec (diff)
downloadmariadb-git-d0acfa458ef10ef46afee7ca81bfad3064026d38.tar.gz
MDEV-14245 tokudb_alter_table.drop_add_pk_part_104 fails
"tokudb_alter_table.drop_add_pk_part_104 leaves a temporary file behind" Fixed by copying 3 lines from 10.1 to 10.0 that cleaned up the temporary file for partitioning tables.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_table.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 2d346a64613..46705827e41 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -8840,7 +8840,9 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
TODO don't create the frm in the first place
*/
- deletefrm(alter_ctx.get_tmp_path());
+ const char *path= alter_ctx.get_tmp_path();
+ table->file->ha_create_partitioning_metadata(path, NULL, CHF_DELETE_FLAG);
+ deletefrm(path);
my_free(const_cast<uchar*>(frm.str));
goto end_inplace;
}