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

Merge branch '11.2' into 11.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-10-30 09:24:04 +01:00
parent 973e641c32 67c0fd2a41
commit c770bce898
734 changed files with 10187 additions and 4442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_show.cc
View File

@@ -1885,7 +1885,7 @@ static void add_table_options(THD *thd, TABLE *table,
hton= table->part_info->default_engine_type;
else
#endif
hton= table->file->ht;
hton= table->file->storage_ht();
bzero((char*) &create_info, sizeof(create_info));
/* Allow update_create_info to update row type, page checksums and options */
@@ -3915,7 +3915,7 @@ static bool show_status_array(THD *thd, const char *wild,
if ((wild_checked ||
!(wild && wild[0] && wild_case_compare(system_charset_info,
name_buffer, wild))) &&
(!cond || cond->val_int()))
(!cond || cond->val_bool()))
{
const char *pos; // We assign a lot of const's
size_t length;
@@ -5506,7 +5506,7 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
table->field[schema_table->idx_field2]->
store(table_name->str, table_name->length, system_charset_info);
if (!partial_cond || partial_cond->val_int())
if (!partial_cond || partial_cond->val_bool())
{
/*
If table is I_S.tables and open_table_method is 0 (eg SKIP_OPEN)
@@ -8505,7 +8505,7 @@ int fill_status(THD *thd, TABLE_LIST *tables, COND *cond)
COND *partial_cond= make_cond_for_info_schema(thd, cond, tables);
// Evaluate and cache const subqueries now, before the mutex.
if (partial_cond)
partial_cond->val_int();
partial_cond->val_bool();
tmp.local_memory_used= 0; // meaning tmp was not populated yet