diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-02 14:04:14 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-10 18:21:24 +0100 |
| commit | 25c32c89f14cba402a42a61a8a371ce515610899 (patch) | |
| tree | c5e5af28fe3ac196d336ac8da3af383909436be2 /sql/sql_show.cc | |
| parent | 8eb66bc382295003e5da5ff50365d62def30f52d (diff) | |
| download | mariadb-git-25c32c89f14cba402a42a61a8a371ce515610899.tar.gz | |
trivial cleanup
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index ae3874506dd..01132fced19 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4430,15 +4430,13 @@ try_acquire_high_prio_shared_mdl_lock(THD *thd, TABLE_LIST *table, open_tables function for this table */ -static int fill_schema_table_from_frm(THD *thd, TABLE_LIST *tables, +static int fill_schema_table_from_frm(THD *thd, TABLE *table, ST_SCHEMA_TABLE *schema_table, LEX_STRING *db_name, LEX_STRING *table_name, - enum enum_schema_tables schema_table_idx, Open_tables_backup *open_tables_state_backup, bool can_deadlock) { - TABLE *table= tables->table; TABLE_SHARE *share; TABLE tbl; TABLE_LIST table_list; @@ -4796,9 +4794,8 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) if (!(table_open_method & ~OPEN_FRM_ONLY) && db_name != &INFORMATION_SCHEMA_NAME) { - if (!fill_schema_table_from_frm(thd, tables, schema_table, + if (!fill_schema_table_from_frm(thd, table, schema_table, db_name, table_name, - schema_table_idx, &open_tables_state_backup, can_deadlock)) continue; |