database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-29 00:08:14 +03:00
Code Activity

Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0

Browse Source 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
This commit is contained in:
igor@rurik.mysql.com
2006-01-07 23:10:08 -08:00
parent d2cfad167b 05947d9916
commit bf78fd5438
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@@ -365,7 +365,7 @@ JOIN::prepare(Item ***rref_pointer_array,
if (having_fix_rc || thd->net.report_error)
DBUG_RETURN(-1); /* purecov: inspected */
if (having->with_sum_func)
having->split_sum_func(thd, ref_pointer_array, all_fields);
having->split_sum_func2(thd, ref_pointer_array, all_fields, &having);
thd->lex->allow_sum_func= save_allow_sum_func;
}
if (select_lex->inner_sum_func_list)