diff options
| author | unknown <sergefp@mysql.com> | 2005-02-14 23:47:31 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-02-14 23:47:31 +0300 |
| commit | 40ffce74eb09dc1fd59d9d67fd44688be7f92fca (patch) | |
| tree | 0b43485d7a0319132be73b556a47e649ddb1bba6 /sql/sql_class.h | |
| parent | c042d67c90715c5674161c74b6a1069b776e786a (diff) | |
| parent | 4173610bd23f07545843e0671f402cfcb6eadc32 (diff) | |
| download | mariadb-git-40ffce74eb09dc1fd59d9d67fd44688be7f92fca.tar.gz | |
Merge mysql.com:/home/psergey/mysql-4.1-bug8218
into mysql.com:/home/psergey/mysql-5.0-bug8218
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 32a2390a402..7d3ee78ccf5 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1426,7 +1426,11 @@ public: #include <myisam.h> -/* Param to create temporary tables when doing SELECT:s */ +/* + Param to create temporary tables when doing SELECT:s + NOTE + This structure is copied using memcpy as a part of JOIN. +*/ class TMP_TABLE_PARAM :public Sql_alloc { @@ -1438,7 +1442,6 @@ private: public: List<Item> copy_funcs; List<Item> save_copy_funcs; - List_iterator_fast<Item> copy_funcs_it; Copy_field *copy_field, *copy_field_end; Copy_field *save_copy_field, *save_copy_field_end; byte *group_buff; @@ -1456,7 +1459,7 @@ public: CHARSET_INFO *table_charset; TMP_TABLE_PARAM() - :copy_funcs_it(copy_funcs), copy_field(0), group_parts(0), + :copy_field(0), group_parts(0), group_length(0), group_null_parts(0), convert_blob_length(0) {} ~TMP_TABLE_PARAM() |