diff options
| author | unknown <timour@askmonty.org> | 2011-03-30 10:10:59 +0300 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2011-03-30 10:10:59 +0300 |
| commit | 952556b3452d4a6893a678da88809b22e7f7a466 (patch) | |
| tree | 938de6db815840eb2038bdded942ab684e4673d0 /sql/sql_class.cc | |
| parent | 9762b236d47e74f2f065c89a747c1a8d3444ed18 (diff) | |
| parent | 0737fb479f082c424881e79e4c358670176ebca2 (diff) | |
| download | mariadb-git-952556b3452d4a6893a678da88809b22e7f7a466.tar.gz | |
MWL#89
Merge 5.3 with 5.3-mwl89.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index f10655c3e51..b4a57f8c60e 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2692,6 +2692,7 @@ void Query_arena::free_items() for (; free_list; free_list= next) { next= free_list->next; + DBUG_ASSERT(free_list != next); free_list->delete_self(); } /* Postcondition: free_list is 0 */ @@ -3135,6 +3136,7 @@ void TMP_TABLE_PARAM::init() table_charset= 0; precomputed_group_by= 0; bit_fields_as_long= 0; + materialized_subquery= 0; skip_create_table= 0; DBUG_VOID_RETURN; } |