diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-03-31 21:32:41 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-03-31 21:32:41 +0200 |
| commit | ac5a534a4caa6c86762e721dfe7183be2fee29ca (patch) | |
| tree | a3d40e82beeef165e5965aec282a458b1febf23a /sql/table.h | |
| parent | e093e5abbed1a7883b8a78935c11505bd0bcb0d6 (diff) | |
| parent | eaebe8b5600b144c51a9405de42a70bd4b710987 (diff) | |
| download | mariadb-git-ac5a534a4caa6c86762e721dfe7183be2fee29ca.tar.gz | |
Merge remote-tracking branch '10.4' into 10.5
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/table.h b/sql/table.h index 3ea8347de68..d8756deb43c 100644 --- a/sql/table.h +++ b/sql/table.h @@ -2690,6 +2690,8 @@ struct TABLE_LIST } void print(THD *thd, table_map eliminated_tables, String *str, enum_query_type query_type); + void print_leaf_tables(THD *thd, String *str, + enum_query_type query_type); bool check_single_table(TABLE_LIST **table, table_map map, TABLE_LIST *view); bool set_insert_values(MEM_ROOT *mem_root); @@ -2830,8 +2832,7 @@ struct TABLE_LIST DBUG_PRINT("enter", ("Alias: '%s' Unit: %p", (alias.str ? alias.str : "<NULL>"), get_unit())); - derived_type= static_cast<uint8>((derived_type & DTYPE_MASK) | - DTYPE_TABLE | DTYPE_MERGE); + derived_type= static_cast<uint8>((derived_type & DTYPE_MASK) | DTYPE_MERGE); set_check_merged(); DBUG_VOID_RETURN; } @@ -2845,10 +2846,9 @@ struct TABLE_LIST DBUG_PRINT("enter", ("Alias: '%s' Unit: %p", (alias.str ? alias.str : "<NULL>"), get_unit())); - derived= get_unit(); derived_type= static_cast<uint8>((derived_type & (derived ? DTYPE_MASK : DTYPE_VIEW)) | - DTYPE_TABLE | DTYPE_MATERIALIZE); + DTYPE_MATERIALIZE); set_check_materialized(); DBUG_VOID_RETURN; } |