diff options
| author | unknown <evgen@moonbone.local> | 2007-01-11 23:20:27 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-01-11 23:20:27 +0300 |
| commit | 0f0d0f5bd45ef87ff75bc15c3faac8d9cb97c154 (patch) | |
| tree | da258ef94eaaa000fa49d9af6f7d01f8e0e599bc /sql/sql_base.cc | |
| parent | 7f9da471cd5f0b2b04242c4905aa45b049de59dc (diff) | |
| parent | 4d143a6ff6112cc3f03bc078a97417c22810ad19 (diff) | |
| download | mariadb-git-0f0d0f5bd45ef87ff75bc15c3faac8d9cb97c154.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/work/23417-bug-5.0-opt-mysql
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index a4318f7b4bf..0949d4aa331 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4406,6 +4406,7 @@ bool setup_fields(THD *thd, Item **ref_pointer_array, bzero(ref_pointer_array, sizeof(Item *) * fields.elements); Item **ref= ref_pointer_array; + thd->lex->current_select->cur_pos_in_select_list= 0; while ((item= it++)) { if (!item->fixed && item->fix_fields(thd, it.ref()) || @@ -4421,7 +4422,10 @@ bool setup_fields(THD *thd, Item **ref_pointer_array, sum_func_list) item->split_sum_func(thd, ref_pointer_array, *sum_func_list); thd->used_tables|= item->used_tables(); + thd->lex->current_select->cur_pos_in_select_list++; } + thd->lex->current_select->cur_pos_in_select_list= UNDEF_POS; + thd->lex->allow_sum_func= save_allow_sum_func; thd->set_query_id= save_set_query_id; DBUG_RETURN(test(thd->net.report_error)); |