diff options
author | unknown <bell@sanja.is.com.ua> | 2003-07-01 13:57:46 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2003-07-01 13:57:46 +0300 |
commit | 2f8f8fabb1db620adf960d2cd17d59809c659fee (patch) | |
tree | 42aaf6c308ef4c78f23f188e2f7f32d5f0c20a89 /sql/sql_select.h | |
parent | da25c0337a596c8300af69b2f4e53c3cee526bc5 (diff) | |
parent | e263b81472a143884a3158c8d6c5c071184d9bf8 (diff) | |
download | mariadb-git-2f8f8fabb1db620adf960d2cd17d59809c659fee.tar.gz |
merge
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r-- | sql/sql_select.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index df21d337b54..3dc675bc201 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -137,7 +137,7 @@ class JOIN :public Sql_alloc POSITION positions[MAX_TABLES+1],best_positions[MAX_TABLES+1]; double best_read; List<Item> *fields; - List<Item_buff> group_fields; + List<Item_buff> group_fields, group_fields_cache; TABLE *tmp_table; // used to store 2 possible tmp table of SELECT TABLE *exec_tmp_table1, *exec_tmp_table2; |