diff options
| author | unknown <timour@askmonty.org> | 2010-12-03 15:37:54 +0200 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2010-12-03 15:37:54 +0200 |
| commit | be95cde85991f4d4149d6532801720e583257642 (patch) | |
| tree | 3a776a23ab79ba041809b6cf9fd813925bf8b24f /sql/sql_class.cc | |
| parent | ab5e4eefd5d25c6e0755c2460dbb433a7a9e913b (diff) | |
| parent | 1b3336dc30cf97283cca6071f089df992c425eb2 (diff) | |
| download | mariadb-git-be95cde85991f4d4149d6532801720e583257642.tar.gz | |
Merge 5.3-mwl89 into 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 3acb2db9aa6..cbacd072eb0 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2657,6 +2657,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 */ @@ -3100,6 +3101,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; } |