database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-22166 fixup: Undefined reference to WFRM_WRITE_EXTRACTED

Browse Source 
It turns out that WFRM_WRITE_EXTRACTED was added only in a debug
assertion and in a comment, as part of
commit b7bba721ee.
This commit is contained in:
Marko Mäkelä
2021-10-27 10:22:23 +03:00
parent 91fe87c7a8
commit c437497e14
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_table.cc
View File

@@ -708,8 +708,8 @@ uint build_table_shadow_filename(char *buff, size_t bufflen,
/* /*
TODO: Partitioning atomic DDL refactoring: WFRM_WRITE_SHADOW and TODO: Partitioning atomic DDL refactoring: WFRM_WRITE_SHADOW
WFRM_WRITE_EXTRACTED should be merged with create_table_impl(frm_only == true). should be merged with create_table_impl(frm_only == true).
*/ */
bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags) 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)) CHF_RENAME_FLAG))
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
DBUG_ASSERT(!(flags & WFRM_WRITE_EXTRACTED));
#else /* !WITH_PARTITION_STORAGE_ENGINE */ #else /* !WITH_PARTITION_STORAGE_ENGINE */
DBUG_ASSERT(!(flags & WFRM_BACKUP_ORIGINAL)); DBUG_ASSERT(!(flags & WFRM_BACKUP_ORIGINAL));
#endif /* !WITH_PARTITION_STORAGE_ENGINE */ #endif /* !WITH_PARTITION_STORAGE_ENGINE */