diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sp_pcontext.h | 2 | ||||
| -rw-r--r-- | sql/sql_array.h | 4 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h index fbf32244665..4d8623108aa 100644 --- a/sql/sp_pcontext.h +++ b/sql/sp_pcontext.h @@ -238,7 +238,7 @@ public: /// The class represents parse-time context, which keeps track of declared /// variables/parameters, conditions, handlers, cursors and labels. /// -/// sp_context objects are organized in a tree according to the following +/// sp_pcontext objects are organized in a tree according to the following /// rules: /// - one sp_pcontext object corresponds for for each BEGIN..END block; /// - one sp_pcontext object corresponds for each exception handler; diff --git a/sql/sql_array.h b/sql/sql_array.h index baed3687215..71377b91ef9 100644 --- a/sql/sql_array.h +++ b/sql/sql_array.h @@ -92,6 +92,8 @@ private: /* A typesafe wrapper around DYNAMIC_ARRAY + + TODO: Change creator to take a THREAD_SPECIFIC option. */ template <class Elem> class Dynamic_array @@ -106,7 +108,7 @@ public: void init(uint prealloc=16, uint increment=16) { my_init_dynamic_array(&array, sizeof(Elem), prealloc, increment, - MYF(MY_THREAD_SPECIFIC)); + MYF(0)); } /** diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 21bf07cd653..cb506adb495 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3914,8 +3914,7 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, } else { - Open_table_context ot_ctx(thd, MYSQL_OPEN_TEMPORARY_ONLY); - if (open_table(thd, create_table, thd->mem_root, &ot_ctx)) + if (open_temporary_table(thd, create_table)) { /* This shouldn't happen as creation of temporary table should make |