diff options
| author | igor@igor-inspiron.creware.com <> | 2005-07-08 06:37:09 -0700 |
|---|---|---|
| committer | igor@igor-inspiron.creware.com <> | 2005-07-08 06:37:09 -0700 |
| commit | 3c98b0132e36f6ded3a0c16d7e5721981c11f269 (patch) | |
| tree | b8bdfd41096a1023a39a321dbc820924bc6ec4d1 /sql/sql_select.cc | |
| parent | 8b6c6eea4938f83896bca74dc3237a95cd959239 (diff) | |
| parent | c896dd4f404ed7a3d562b5738527b650bc54bc9b (diff) | |
| download | mariadb-git-3c98b0132e36f6ded3a0c16d7e5721981c11f269.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into igor-inspiron.creware.com:/home/igor/mysql-4.1
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 972fb4e0368..7abdde25911 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9330,7 +9330,7 @@ bool JOIN::rollup_init() ORDER *group_tmp; for (group_tmp= group_list; group_tmp; group_tmp= group_tmp->next) { - if (item->eq(*group_tmp->item,0)) + if (*group_tmp->item == item) item->maybe_null= 1; } if (item->type() == Item::FUNC_ITEM) @@ -9452,7 +9452,7 @@ bool JOIN::rollup_make_fields(List<Item> &fields_arg, List<Item> &sel_fields, for (group_tmp= start_group, i= pos ; group_tmp ; group_tmp= group_tmp->next, i++) { - if (item->eq(*group_tmp->item,0)) + if (*group_tmp->item == item) { /* This is an element that is used by the GROUP BY and should be |