diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-28 21:35:50 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-28 21:35:50 +0200 |
| commit | 184e24b2253a81b03476e3d4d8cf56d5eb9dbf18 (patch) | |
| tree | fabb5447e17b9f0959cb83b6d88351367ca53645 /sql/sql_select.h | |
| parent | 298ba0d39d6d38d5be860a3ad8a55b469b67e7d8 (diff) | |
| download | mariadb-git-184e24b2253a81b03476e3d4d8cf56d5eb9dbf18.tar.gz | |
Fixed ALTER TABLE on MERGE tables
Fixed bug in DISTINCT
Docs/manual.texi:
Updated Changelog
Cleaned up adding character sets
merge/open.c:
skip comments
myisam/mi_check.c:
Fixed bug when sorting index on Windows
myisammrg/myrg_info.c:
Use only portable printf arguments
myisammrg/myrg_rrnd.c:
Use only portable printf arguments
mysql-test/r/distinct.result:
Added test case for bug in distinct
mysql-test/r/merge.result:
Added test for ALTER TABLE
mysql-test/t/distinct.test:
Added test case for bug in distinct
mysql-test/t/merge.test:
Added test for ALTER TABLE
sql-bench/crash-me.sh:
Fixed portability issues
sql/ha_myisammrg.cc:
Fixed for ALTER TABLE on MERGE tables
sql/item_sum.cc:
Fixed bug in DISTINCT
sql/sql_db.cc:
Added test of namelen in check_db_name
sql/sql_select.cc:
Fixed bug in DISTINCT
sql/sql_select.h:
Fixed bug in DISTINCT
sql/sql_table.cc:
Fixed ALTER TABLE on MERGE tables
sql/table.cc:
Added test of namelen in check_db_name
sql/table.h:
Fixed ALTER TABLE on MERGE tables
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 8ac00dde4c5..2f7454e4059 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -124,10 +124,13 @@ class TMP_TABLE_PARAM { KEY *keyinfo; ha_rows end_write_records; uint copy_field_count,field_count,sum_func_count,func_count; + uint hidden_field_count; uint group_parts,group_length; uint quick_group; + bool using_indirect_summary_function; - TMP_TABLE_PARAM() :copy_field(0), group_parts(0), group_length(0) {} + TMP_TABLE_PARAM() :copy_field(0), group_parts(0), group_length(0) + {} ~TMP_TABLE_PARAM() { cleanup(); @@ -178,7 +181,8 @@ TABLE *create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, ORDER *group, bool distinct, bool save_sum_fields, bool allow_distinct_limit, uint select_options); void free_tmp_table(THD *thd, TABLE *entry); -void count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields); +void count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields, + bool reset_with_sum_func); bool setup_copy_fields(TMP_TABLE_PARAM *param,List<Item> &fields); void copy_fields(TMP_TABLE_PARAM *param); void copy_funcs(Item_result_field **func_ptr); |