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

trivial cleanup

Browse Source
This commit is contained in:
Sergei Golubchik
2017-03-02 14:04:14 +01:00
parent 8eb66bc382
commit 25c32c89f1
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_show.cc
View File

@@ -4430,15 +4430,13 @@ try_acquire_high_prio_shared_mdl_lock(THD *thd, TABLE_LIST *table,
open_tables function for this 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, ST_SCHEMA_TABLE *schema_table,
LEX_STRING *db_name, LEX_STRING *db_name,
LEX_STRING *table_name, LEX_STRING *table_name,
enum enum_schema_tables schema_table_idx,
Open_tables_backup *open_tables_state_backup, Open_tables_backup *open_tables_state_backup,
bool can_deadlock) bool can_deadlock)
{ {
TABLE *table= tables->table;
TABLE_SHARE *share; TABLE_SHARE *share;
TABLE tbl; TABLE tbl;
TABLE_LIST table_list; 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) && if (!(table_open_method & ~OPEN_FRM_ONLY) &&
db_name != &INFORMATION_SCHEMA_NAME) 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, db_name, table_name,
schema_table_idx,
&open_tables_state_backup, &open_tables_state_backup,
can_deadlock)) can_deadlock))
continue; continue;