diff options
| author | jimw@mysql.com <> | 2005-03-17 17:22:40 -0800 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-03-17 17:22:40 -0800 |
| commit | dcd336d79d2338f6e9ffda5ddf585407e8ec65a2 (patch) | |
| tree | 2a9a17f9f8923260f91382381af9991d4c8e618b | |
| parent | c59e0fc78b6454eef27f4098b0f631f3358df544 (diff) | |
| download | mariadb-git-dcd336d79d2338f6e9ffda5ddf585407e8ec65a2.tar.gz | |
Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254)
| -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 c461abfc635..2bb4cef1247 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1386,7 +1386,6 @@ JOIN::exec() { DBUG_VOID_RETURN; } - curr_join->group_list= 0; } thd->proc_info="Copying to group table"; @@ -1407,8 +1406,10 @@ JOIN::exec() } } if (curr_join->make_sum_func_list(*curr_all_fields, *curr_fields_list, - 1, TRUE) || - setup_sum_funcs(curr_join->thd, curr_join->sum_funcs) || + 1, TRUE)) + DBUG_VOID_RETURN; + curr_join->group_list= 0; + if (setup_sum_funcs(curr_join->thd, curr_join->sum_funcs) || (tmp_error= do_select(curr_join, (List<Item> *) 0, curr_tmp_table, 0))) { |