diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-10-19 15:04:12 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-10-19 15:04:12 +0200 |
| commit | 5e1fe0f80043993c1db64169e4d87eb787762763 (patch) | |
| tree | 3b1cae348369aff41bc05399edc6b42f12f1d6dc /sql | |
| parent | d30186772fc90d9c16c118f0a72fff3f0be50e03 (diff) | |
| parent | 9bfaab57fa991d46844b5e56cb30880c8391c55d (diff) | |
| download | mariadb-git-5e1fe0f80043993c1db64169e4d87eb787762763.tar.gz | |
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
sql/sql_select.cc:
Auto merged
mysql-test/r/olap.result:
SCCS merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index cb1c393457e..f86e9a13d53 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -14156,12 +14156,17 @@ bool JOIN::rollup_init() while ((item= it++)) { ORDER *group_tmp; + bool found_in_group= 0; + for (group_tmp= group_list; group_tmp; group_tmp= group_tmp->next) { if (*group_tmp->item == item) + { item->maybe_null= 1; + found_in_group= 1; + } } - if (item->type() == Item::FUNC_ITEM) + if (item->type() == Item::FUNC_ITEM && !found_in_group) { bool changed= FALSE; if (change_group_ref(thd, (Item_func *) item, group_list, &changed)) |