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.h | |
| parent | 5de08a53ef8567d9c316c5a9eb4eda0ed6a2b11e (diff) | |
| download | mariadb-git-1d4ac3d4d3ec3d52284f7260907111618f6cb6d9.tar.gz | |
cleanup
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 8a2317d2386..ea92e880db7 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -276,8 +276,7 @@ int init_ftfuncs(THD *thd, SELECT_LEX* select, bool no_order); bool lock_table_names(THD *thd, TABLE_LIST *table_list, TABLE_LIST *table_list_end, ulong lock_wait_timeout, uint flags); -bool open_tables(THD *thd, TABLE_LIST **tables, uint *counter, - Sroutine_hash_entry **sroutine_to_open, uint flags, +bool open_tables(THD *thd, TABLE_LIST **tables, uint *counter, uint flags, Prelocking_strategy *prelocking_strategy); /* open_and_lock_tables with optional derived handling */ bool open_and_lock_tables(THD *thd, TABLE_LIST *tables, @@ -500,15 +499,6 @@ private: inline bool -open_tables(THD *thd, TABLE_LIST **tables, uint *counter, uint flags, - Prelocking_strategy *prelocking_strategy) -{ - return open_tables(thd, tables, counter, &thd->lex->sroutines_list.first, - flags, prelocking_strategy); -} - - -inline bool open_tables(THD *thd, TABLE_LIST **tables, uint *counter, uint flags) { DML_prelocking_strategy prelocking_strategy; |