database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-03-26 11:50:32 +02:00
parent e9e1890162 2e67b9f665
commit 356c149603
74 changed files with 151 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_show.cc
View File

@ -1924,7 +1924,7 @@ static void add_table_options(THD *thd, TABLE *table,
packet->append_ulonglong(share->stats_sample_pages);
}
/* We use CHECKSUM, instead of TABLE_CHECKSUM, for backward compability */
/* We use CHECKSUM, instead of TABLE_CHECKSUM, for backward compatibility */
if (create_info.options & HA_OPTION_CHECKSUM)
packet->append(STRING_WITH_LEN(" CHECKSUM=1"));
if (create_info.page_checksum != HA_CHOICE_UNDEF)
@ -5507,7 +5507,7 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables,
str.qs_append(share->stats_sample_pages);
}
/* We use CHECKSUM, instead of TABLE_CHECKSUM, for backward compability */
/* We use CHECKSUM, instead of TABLE_CHECKSUM, for backward compatibility */
if (share->db_create_options & HA_OPTION_CHECKSUM)
str.qs_append(STRING_WITH_LEN(" checksum=1"));