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

MDEV-22166: Fix cmake -DPLUGIN_PARTITION=NO

Browse Source 
mysql_write_frm(): Correctly enclose code inside
#ifdef WITH_PARTITION_STORAGE_ENGINE
so that cmake -DPLUGIN_PARTITION=NO builds can succeed.
This was broken in
commit b7bba721ee.
This commit is contained in:
Marko Mäkelä
2021-10-27 08:41:11 +03:00
parent 92f7d008ab
commit 91fe87c7a8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_table.cc
View File

@ -722,10 +722,10 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
char path[FN_REFLEN+1]; char path[FN_REFLEN+1];
char shadow_path[FN_REFLEN+1]; char shadow_path[FN_REFLEN+1];
char shadow_frm_name[FN_REFLEN+1]; char shadow_frm_name[FN_REFLEN+1];
char bak_path[FN_REFLEN+1];
char bak_frm_name[FN_REFLEN+1];
char frm_name[FN_REFLEN+1]; char frm_name[FN_REFLEN+1];
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
char bak_path[FN_REFLEN+1];
char bak_frm_name[FN_REFLEN+1];
char *part_syntax_buf; char *part_syntax_buf;
uint syntax_len; uint syntax_len;
partition_info *part_info= lpt->part_info; partition_info *part_info= lpt->part_info;
@ -872,8 +872,8 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
CHF_RENAME_FLAG)) CHF_RENAME_FLAG))
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
#else /* !WITH_PARTITION_STORAGE_ENGINE */
DBUG_ASSERT(!(flags & WFRM_WRITE_EXTRACTED)); DBUG_ASSERT(!(flags & WFRM_WRITE_EXTRACTED));
#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 */
if (flags & WFRM_INSTALL_SHADOW) if (flags & WFRM_INSTALL_SHADOW)