diff options
| author | unknown <igor@rurik.mysql.com> | 2005-03-16 15:55:04 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-03-16 15:55:04 -0800 |
| commit | 31f6b0dde83e7c4fc1626958f40f2c22ca51f23b (patch) | |
| tree | aea08e93e777896437566b45ea6a3d9a6aa0eb50 /sql/sql_select.cc | |
| parent | e16535ce1957567b1f176bdbcda766a8104a5072 (diff) | |
| download | mariadb-git-31f6b0dde83e7c4fc1626958f40f2c22ca51f23b.tar.gz | |
olap.result, olap.test:
Added a test for bug #8615.
sql_select.cc:
Fixed bug #8615.
This fix only removed the cause of the reported crash.
It does not resolve other problems of rollup queries
with DISTINCT. They were fixed in the previous patch
for bug 8616.
sql/sql_select.cc:
Fixed bug #8615.
This fix only removed the cause of the reported crash.
It does not resolve other problems of rollup queries
with DISTINCT. They were fixed in the previous patch
for bug 8616.
mysql-test/t/olap.test:
Added a test for bug #8615.
mysql-test/r/olap.result:
Added a test for bug #8615.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 0bb4c6a9402..5bfe1346568 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1269,7 +1269,6 @@ JOIN::exec() { DBUG_VOID_RETURN; } - curr_join->group_list= 0; } thd->proc_info="Copying to group table"; @@ -1289,8 +1288,10 @@ JOIN::exec() } } if (curr_join->make_sum_func_list(*curr_all_fields, *curr_fields_list, - 1) || - (tmp_error= do_select(curr_join, (List<Item> *) 0, curr_tmp_table, + 1)) + DBUG_VOID_RETURN; + curr_join->group_list= 0; + if ((tmp_error= do_select(curr_join, (List<Item> *) 0, curr_tmp_table, 0))) { error= tmp_error; |