diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-04-26 14:02:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-04-26 14:02:37 +0200 |
| commit | 2ce52790ffc72c4a4d3670ebf67c6655450620f2 (patch) | |
| tree | 4be382f34905809f0a19e87574e2b07b91f5cb7c /sql/sql_base.h | |
| parent | caa9023c9ed101acbcf6b9bd821a09daeb8271ee (diff) | |
| parent | 757daa4174ed1b8786d0307852f79885dd08ea89 (diff) | |
| download | mariadb-git-2ce52790ffc72c4a4d3670ebf67c6655450620f2.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 94294e3aa43..53b5885460b 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -251,8 +251,19 @@ lock_table_names(THD *thd, TABLE_LIST *table_list, table_list_end, lock_wait_timeout, flags); } bool open_tables(THD *thd, const DDL_options_st &options, - TABLE_LIST **tables, uint *counter, uint flags, + TABLE_LIST **tables, uint *counter, + Sroutine_hash_entry **sroutine_to_open, uint flags, Prelocking_strategy *prelocking_strategy); + +static inline bool +open_tables(THD *thd, const DDL_options_st &options, TABLE_LIST **tables, + uint *counter, uint flags, Prelocking_strategy *prelocking_strategy) +{ + return open_tables(thd, options, tables, counter, + &thd->lex->sroutines_list.first, flags, + prelocking_strategy); +} + static inline bool open_tables(THD *thd, TABLE_LIST **tables, uint *counter, uint flags, Prelocking_strategy *prelocking_strategy) @@ -547,6 +558,10 @@ inline bool open_and_lock_tables(THD *thd, TABLE_LIST *tables, bool restart_trans_for_tables(THD *thd, TABLE_LIST *table); +bool extend_table_list(THD *thd, TABLE_LIST *tables, + Prelocking_strategy *prelocking_strategy, + bool has_prelocking_list); + /** A context of open_tables() function, used to recover from a failed open_table() or open_routine() attempt. |