mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Handle default engine type better for
partitioned tables mysql-test/r/partition.result: New test cases for SHOW CREATE TABLE mysql-test/r/partition_range.result: New test cases for SHOW CREATE TABLE mysql-test/t/partition.test: New test cases for SHOW CREATE TABLE mysql-test/t/partition_range.test: New test cases for SHOW CREATE TABLE sql/handler.h: Handle default engine type better sql/sql_partition.cc: Handle default engine type better sql/sql_show.cc: Handle default engine type better sql/sql_table.cc: Handle default engine type better sql/sql_yacc.yy: Handle default engine type better sql/table.cc: Handle default engine type better sql/unireg.cc: Handle default engine type better
This commit is contained in:
@ -961,16 +961,19 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet)
|
||||
packet->append("\n)", 2);
|
||||
if (!(thd->variables.sql_mode & MODE_NO_TABLE_OPTIONS) && !foreign_db_mode)
|
||||
{
|
||||
#if 0 //def HAVE_PARTITION_DB
|
||||
if (!table->s->part_info)
|
||||
#endif
|
||||
{
|
||||
if (thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40))
|
||||
packet->append(" TYPE=", 6);
|
||||
else
|
||||
packet->append(" ENGINE=", 8);
|
||||
if (thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40))
|
||||
packet->append(" TYPE=", 6);
|
||||
else
|
||||
packet->append(" ENGINE=", 8);
|
||||
#ifdef HAVE_PARTITION_DB
|
||||
if (table->s->part_info)
|
||||
packet->append(ha_get_storage_engine(
|
||||
table->s->part_info->default_engine_type));
|
||||
else
|
||||
packet->append(file->table_type());
|
||||
}
|
||||
#else
|
||||
packet->append(file->table_type());
|
||||
#endif
|
||||
|
||||
if (share->table_charset &&
|
||||
!(thd->variables.sql_mode & MODE_MYSQL323) &&
|
||||
|
Reference in New Issue
Block a user