summaryrefslogtreecommitdiff
path: root/sql/sql_base.h
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2015-04-15 12:09:25 -0700
committerSergei Petrunia <psergey@askmonty.org>2015-04-15 12:09:25 -0700
commitc712b376d8189b963851db86a0bedd478aab869e (patch)
tree8d02a74357f8ba77261d79bd70ca6174e0fe5dd8 /sql/sql_base.h
parent25da74ce3f17a4720f4f7f06b1d694ff417d6b60 (diff)
parentd051f6c36beaf6c7ea269d6c174cca7482f3e823 (diff)
downloadmariadb-git-bb-10.1-explain-analyze.tar.gz
Merge branch '10.1' into bb-10.1-explain-analyzebb-10.1-explain-analyze
Diffstat (limited to 'sql/sql_base.h')
-rw-r--r--sql/sql_base.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h
index 0e492fa8cf7..876bc6e7ed7 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -143,7 +143,11 @@ TABLE_LIST *find_table_in_list(TABLE_LIST *table,
const char *db_name,
const char *table_name);
TABLE *find_temporary_table(THD *thd, const char *db, const char *table_name);
+bool find_and_use_temporary_table(THD *thd, const char *db,
+ const char *table_name, TABLE **out_table);
TABLE *find_temporary_table(THD *thd, const TABLE_LIST *tl);
+bool find_and_use_temporary_table(THD *thd, const TABLE_LIST *tl,
+ TABLE **out_table);
TABLE *find_temporary_table(THD *thd, const char *table_key,
uint table_key_length);
void close_thread_tables(THD *thd);