diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-16 15:07:04 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-16 15:07:04 +0300 |
| commit | 8543621fa0f4a3c4102ac8f799888ef79e2e1dcf (patch) | |
| tree | 29e8f301ef929cfe1c00eec9dee265aa0acaa350 /sql/sql_class.cc | |
| parent | f458e198c0bea67c6a3787738108bbfb139639bd (diff) | |
| parent | bcee6652c6052cabd67f8d30c14e162235749d38 (diff) | |
| download | mariadb-git-8543621fa0f4a3c4102ac8f799888ef79e2e1dcf.tar.gz | |
Merge with 5.3 main
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 58e9d55bb10..17fffffa227 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2697,6 +2697,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 */ @@ -3141,6 +3142,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; } |