summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-27 10:22:23 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-27 10:22:23 +0300
commitc437497e149c8e381c9d1219e2a98af0d0af700e (patch)
tree3c2dbd402deb13bcf3cf763b553836bbcf9f60c1
parent91fe87c7a872ba6c14850bad72b8ec99d383b38d (diff)
downloadmariadb-git-c437497e149c8e381c9d1219e2a98af0d0af700e.tar.gz
MDEV-22166 fixup: Undefined reference to WFRM_WRITE_EXTRACTED
It turns out that WFRM_WRITE_EXTRACTED was added only in a debug assertion and in a comment, as part of commit b7bba721eee42af892178a747fa72a6fc2975c94.
-rw-r--r--sql/sql_table.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index c2b73ea4e2b..6f6d643e0cd 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -708,8 +708,8 @@ uint build_table_shadow_filename(char *buff, size_t bufflen,
/*
- TODO: Partitioning atomic DDL refactoring: WFRM_WRITE_SHADOW and
- WFRM_WRITE_EXTRACTED should be merged with create_table_impl(frm_only == true).
+ TODO: Partitioning atomic DDL refactoring: WFRM_WRITE_SHADOW
+ should be merged with create_table_impl(frm_only == true).
*/
bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
{
@@ -872,7 +872,6 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
CHF_RENAME_FLAG))
DBUG_RETURN(TRUE);
}
- DBUG_ASSERT(!(flags & WFRM_WRITE_EXTRACTED));
#else /* !WITH_PARTITION_STORAGE_ENGINE */
DBUG_ASSERT(!(flags & WFRM_BACKUP_ORIGINAL));
#endif /* !WITH_PARTITION_STORAGE_ENGINE */