diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-05-22 22:05:56 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-06-01 09:43:40 +0200 |
| commit | 1d4ac3d4d3ec3d52284f7260907111618f6cb6d9 (patch) | |
| tree | aaed9fcff7371dd4cddd8c0812b468e3ff19d6d9 /sql/sql_base.cc | |
| parent | 5de08a53ef8567d9c316c5a9eb4eda0ed6a2b11e (diff) | |
| download | mariadb-git-1d4ac3d4d3ec3d52284f7260907111618f6cb6d9.tar.gz | |
cleanup
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 4cc7b2fe3b9..a98cfbbd5c0 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5003,8 +5003,7 @@ open_tables_check_upgradable_mdl(THD *thd, TABLE_LIST *tables_start, @retval TRUE Error, reported. */ -bool open_tables(THD *thd, TABLE_LIST **start, uint *counter, - Sroutine_hash_entry **sroutine_to_open_list, uint flags, +bool open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags, Prelocking_strategy *prelocking_strategy) { /* @@ -5053,7 +5052,7 @@ restart: has_prelocking_list= thd->lex->requires_prelocking(); table_to_open= start; - sroutine_to_open= sroutine_to_open_list; + sroutine_to_open= &thd->lex->sroutines_list.first; *counter= 0; thd_proc_info(thd, "Opening tables"); @@ -5112,8 +5111,7 @@ restart: elements in prelocking list/set. */ while (*table_to_open || - (thd->locked_tables_mode <= LTM_LOCK_TABLES && - *sroutine_to_open)) + (thd->locked_tables_mode <= LTM_LOCK_TABLES && *sroutine_to_open)) { /* For every table in the list of tables to open, try to find or open |