diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-20 22:26:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 10:54:34 +0100 |
| commit | 9214d043fd864f8ee96e34551e49a011e20ddef0 (patch) | |
| tree | d4f2e0e757d5eb4920947a79e7cf14b227346d1f /sql/sql_show.h | |
| parent | 57905d18d650004ca84d7f9b01f0cf72e100d6bc (diff) | |
| download | mariadb-git-9214d043fd864f8ee96e34551e49a011e20ddef0.tar.gz | |
disable SHOW I_S_table for built-in I_S tables
This fixes
MDEV-9538 Server crashes in check_show_access on SHOW STATISTICS
MDEV-9539 Server crashes in make_columns_old_format on SHOW GEOMETRY_COLUMNS
MDEV-9540 SHOW SPATIAL_REF_SYS and SHOW SYSTEM_VARIABLES return empty results with numerous warnings
Diffstat (limited to 'sql/sql_show.h')
| -rw-r--r-- | sql/sql_show.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_show.h b/sql/sql_show.h index ecb7e9468ea..d92479971cd 100644 --- a/sql/sql_show.h +++ b/sql/sql_show.h @@ -117,7 +117,10 @@ bool schema_table_store_record(THD *thd, TABLE *table); void initialize_information_schema_acl(); COND *make_cond_for_info_schema(THD *thd, COND *cond, TABLE_LIST *table); -ST_SCHEMA_TABLE *find_schema_table(THD *thd, const char* table_name); +ST_SCHEMA_TABLE *find_schema_table(THD *thd, const char* table_name, bool *in_plugin); +static inline ST_SCHEMA_TABLE *find_schema_table(THD *thd, const char* table_name) +{ bool unused; return find_schema_table(thd, table_name, &unused); } + ST_SCHEMA_TABLE *get_schema_table(enum enum_schema_tables schema_table_idx); int make_schema_select(THD *thd, SELECT_LEX *sel, ST_SCHEMA_TABLE *schema_table); |