diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-08-13 10:12:41 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-08-13 10:12:41 +0300 |
| commit | 2f27bbd977067a841ca0a8bedd8a3a92ce773527 (patch) | |
| tree | 1c5a2a50f7c762c374feec4dee0b68299df93cb7 /sql/sql_select.h | |
| parent | 22422b78135df9d85fe8079f44319f47d33b4e1a (diff) | |
| parent | dc271c8fc362b8ddc8897f3a645aa97e87b1d2f9 (diff) | |
| download | mariadb-git-2f27bbd977067a841ca0a8bedd8a3a92ce773527.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
sql/item_sum.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 7b5aa49b9aa..208eaaea7bd 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -293,7 +293,8 @@ void TEST_join(JOIN *join); bool store_val_in_field(Field *field,Item *val); TABLE *create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, ORDER *group, bool distinct, bool save_sum_fields, - ulong select_options, ha_rows rows_limit); + ulong select_options, ha_rows rows_limit, + char* alias); void free_tmp_table(THD *thd, TABLE *entry); void count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields, bool reset_with_sum_func); |