diff options
| author | unknown <serg@serg.mylan> | 2006-02-15 14:04:56 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-02-15 14:04:56 +0100 |
| commit | 00c7507249a22de8467e297abe900871ab293ca4 (patch) | |
| tree | ebbf7e7c5b5f74e28a4f0110f4430bdd6a8b09d8 /sql/sql_select.cc | |
| parent | f8b27ebb54259d2e148db62ddd65761fe1ea36a9 (diff) | |
| parent | bf3b67f3473f233cfead71a121040cee8bbd3198 (diff) | |
| download | mariadb-git-00c7507249a22de8467e297abe900871ab293ca4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index fad382e46b0..5d01980025e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -13228,7 +13228,7 @@ change_to_use_tmp_fields(THD *thd, Item **ref_pointer_array, for (i= 0; (item= it++); i++) { Field *field; - + if (item->with_sum_func && item->type() != Item::SUM_FUNC_ITEM) item_field= item; else @@ -13247,7 +13247,7 @@ change_to_use_tmp_fields(THD *thd, Item **ref_pointer_array, DBUG_RETURN(TRUE); // Fatal error item_field->name= item->name; #ifndef DBUG_OFF - if (_db_on_ && !item_field->name) + if (!item_field->name) { char buff[256]; String str(buff,sizeof(buff),&my_charset_bin); |