diff options
| author | unknown <timour@askmonty.org> | 2011-05-02 21:59:16 +0300 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2011-05-02 21:59:16 +0300 |
| commit | 5dc11616b266bfcd0849cbf44bf4222b7a661f46 (patch) | |
| tree | c64ae4a7f8f12332f7d3bd4817626fa00c1e4981 /sql/sql_class.cc | |
| parent | 8ac88c88f0038350064429fda626233260eb6721 (diff) | |
| parent | 0f4236659c2af3720d57255e224b3a8bb4f1d697 (diff) | |
| download | mariadb-git-5dc11616b266bfcd0849cbf44bf4222b7a661f46.tar.gz | |
MWL#89
Merge with 5.3
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 a5c06d2aa77..872c065e36a 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 */ @@ -3140,6 +3141,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; } |