diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-13 16:42:21 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-13 16:42:21 +0200 |
| commit | 50653e021f1678c3c28c6b5886fadb9fcf8d87ff (patch) | |
| tree | 1e0fa45c58e4405da192d7e7a41c39b0128e9b11 /sql/sql_base.h | |
| parent | e9145aab44f3c052868836f2fe1b9ca87ae6895b (diff) | |
| parent | 5b65d61d9384a45ea1b8df79694493fbb1a14e4a (diff) | |
| download | mariadb-git-50653e021f1678c3c28c6b5886fadb9fcf8d87ff.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index b9e96bffab7..b67341bcbda 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -239,17 +239,7 @@ lock_table_names(THD *thd, TABLE_LIST *table_list, } bool open_tables(THD *thd, const DDL_options_st &options, 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); -} + uint flags, Prelocking_strategy *prelocking_strategy); static inline bool open_tables(THD *thd, TABLE_LIST **tables, uint *counter, uint flags, @@ -404,6 +394,7 @@ class Prelocking_strategy public: virtual ~Prelocking_strategy() { } + virtual void reset(THD *thd) { }; virtual bool handle_routine(THD *thd, Query_tables_list *prelocking_ctx, Sroutine_hash_entry *rt, sp_head *sp, bool *need_prelocking) = 0; @@ -411,6 +402,7 @@ public: TABLE_LIST *table_list, bool *need_prelocking) = 0; virtual bool handle_view(THD *thd, Query_tables_list *prelocking_ctx, TABLE_LIST *table_list, bool *need_prelocking)= 0; + virtual bool handle_end(THD *thd) { return 0; }; }; |