mirror of
https://github.com/MariaDB/server.git
synced 2026-05-02 13:15:32 +02:00
merge
configure.in: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged
This commit is contained in:
commit
967c1b04c0
46 changed files with 2005 additions and 254 deletions
|
|
@ -889,6 +889,12 @@ store_create_info(THD *thd, TABLE *table, String *packet)
|
|||
packet->append(" CHECKSUM=1", 11);
|
||||
if (table->db_create_options & HA_OPTION_DELAY_KEY_WRITE)
|
||||
packet->append(" DELAY_KEY_WRITE=1",18);
|
||||
if (table->comment && table->comment[0])
|
||||
{
|
||||
packet->append(" COMMENT='", 10);
|
||||
append_unescaped(packet, table->comment);
|
||||
packet->append('\'');
|
||||
}
|
||||
if (file->raid_type)
|
||||
{
|
||||
char buff[100];
|
||||
|
|
@ -896,13 +902,6 @@ store_create_info(THD *thd, TABLE *table, String *packet)
|
|||
my_raid_type(file->raid_type), file->raid_chunks, file->raid_chunksize/RAID_BLOCK_SIZE);
|
||||
packet->append(buff);
|
||||
}
|
||||
if(table->comment)
|
||||
{
|
||||
packet->append(" COMMENT='", 10);
|
||||
append_unescaped(packet, table->comment);
|
||||
packet->append('\'');
|
||||
}
|
||||
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue