Merge mysql-5.1 to mysql-5.5.
This commit is contained in:
commit
3d430ac5cb
@ -1162,7 +1162,9 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
|
||||
handler *file= table->file;
|
||||
TABLE_SHARE *share= table->s;
|
||||
HA_CREATE_INFO create_info;
|
||||
#ifdef WITH_PARTITION_STORAGE_ENGINE
|
||||
bool show_table_options= FALSE;
|
||||
#endif /* WITH_PARTITION_STORAGE_ENGINE */
|
||||
bool foreign_db_mode= (thd->variables.sql_mode & (MODE_POSTGRESQL |
|
||||
MODE_ORACLE |
|
||||
MODE_MSSQL |
|
||||
@ -1378,7 +1380,9 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
|
||||
packet->append(STRING_WITH_LEN("\n)"));
|
||||
if (!(thd->variables.sql_mode & MODE_NO_TABLE_OPTIONS) && !foreign_db_mode)
|
||||
{
|
||||
#ifdef WITH_PARTITION_STORAGE_ENGINE
|
||||
show_table_options= TRUE;
|
||||
#endif /* WITH_PARTITION_STORAGE_ENGINE */
|
||||
|
||||
/* TABLESPACE and STORAGE */
|
||||
if (share->tablespace ||
|
||||
|
Loading…
x
Reference in New Issue
Block a user