diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2019-04-12 22:47:29 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 22:47:29 +0900 |
| commit | df2d376eca665e26845d8e6c636bf9f6c1714b1b (patch) | |
| tree | 77472ce6fdb212e7cadb9fe1ccd351bab193797a /sql/sql_parse.cc | |
| parent | f0509afa1b635cd7c091f349a3b8dd72b4b92b94 (diff) | |
| parent | 7896503686477cce55d058d071d2858a8abf4b04 (diff) | |
| download | mariadb-git-bb-10.4-MDEV-16530.tar.gz | |
Merge branch '10.4' into bb-10.4-MDEV-16530bb-10.4-MDEV-16530
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 2da704d9b17..d5d721e0ede 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -8371,7 +8371,6 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, ptr->derived= table->sel; if (!ptr->derived && is_infoschema_db(&ptr->db)) { - ST_SCHEMA_TABLE *schema_table; if (ptr->updating && /* Special cases which are processed by commands itself */ lex->sql_command != SQLCOM_CHECK && @@ -8383,20 +8382,8 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, INFORMATION_SCHEMA_NAME.str); DBUG_RETURN(0); } + ST_SCHEMA_TABLE *schema_table; schema_table= find_schema_table(thd, &ptr->table_name); - if (unlikely(!schema_table) || - (schema_table->hidden && - ((sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) == 0 || - /* - this check is used for show columns|keys from I_S hidden table - */ - lex->sql_command == SQLCOM_SHOW_FIELDS || - lex->sql_command == SQLCOM_SHOW_KEYS))) - { - my_error(ER_UNKNOWN_TABLE, MYF(0), - ptr->table_name.str, INFORMATION_SCHEMA_NAME.str); - DBUG_RETURN(0); - } ptr->schema_table_name= ptr->table_name; ptr->schema_table= schema_table; } |