1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge branch '10.5' into 10.6

This commit is contained in:
Oleksandr Byelkin
2023-08-02 20:20:50 +02:00
42 changed files with 639 additions and 404 deletions

View File

@@ -1977,8 +1977,13 @@ static void add_table_options(THD *thd, TABLE *table,
}
if (share->transactional != HA_CHOICE_UNDEF)
{
bool do_comment= !table->file->has_transactional_option() && check_options;
if (do_comment)
packet->append(STRING_WITH_LEN(" /*"));
packet->append(STRING_WITH_LEN(" TRANSACTIONAL="));
packet->append(ha_choice_values[(uint) share->transactional]);
if (do_comment)
packet->append(STRING_WITH_LEN(" */"));
}
if (share->table_type == TABLE_TYPE_SEQUENCE)
packet->append(STRING_WITH_LEN(" SEQUENCE=1"));