diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-09-28 10:19:25 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-09-28 10:19:25 +0200 |
| commit | b8fe620615adb5a5ab6804689e5111b4d9952c2e (patch) | |
| tree | 107adad7035c003c1c4f2ffd28f8e5c7547e0c89 /sql/sql_select.cc | |
| parent | abd883f4d02e6d32c4ac0446345bd27c2455db55 (diff) | |
| parent | 2b59a97b11842a445b0351163c01dd44253fab27 (diff) | |
| download | mariadb-git-b8fe620615adb5a5ab6804689e5111b4d9952c2e.tar.gz | |
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 02ec7ae08ed..74a9fc573c4 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -290,8 +290,6 @@ JOIN::prepare(Item ***rref_pointer_array, select_lex->having_fix_field= 0; if (having_fix_rc || thd->net.report_error) DBUG_RETURN(-1); /* purecov: inspected */ - if (having->with_sum_func) - having->split_sum_func2(thd, ref_pointer_array, all_fields, &having); } // Is it subselect @@ -306,6 +304,9 @@ JOIN::prepare(Item ***rref_pointer_array, } } + if (having && having->with_sum_func) + having->split_sum_func2(thd, ref_pointer_array, all_fields, &having); + if (setup_ftfuncs(select_lex)) /* should be after having->fix_fields */ DBUG_RETURN(-1); |