Commit f197b179 authored by pem@mysql.com's avatar pem@mysql.com

Got rid of silly compiler errors on HP-UX and SGI Irix.

parent 3e0464b8
...@@ -1631,6 +1631,8 @@ void Item_func_group_concat::reset_field() ...@@ -1631,6 +1631,8 @@ void Item_func_group_concat::reset_field()
bool bool
Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
{ {
uint i; /* for loop variable */
if (!thd->allow_sum_func) if (!thd->allow_sum_func)
{ {
my_error(ER_INVALID_GROUP_FUNC_USE,MYF(0)); my_error(ER_INVALID_GROUP_FUNC_USE,MYF(0));
...@@ -1639,13 +1641,13 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -1639,13 +1641,13 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
thd->allow_sum_func= 0; thd->allow_sum_func= 0;
maybe_null= 0; maybe_null= 0;
for (uint i= 0 ; i < arg_count ; i++) for (i= 0 ; i < arg_count ; i++)
{ {
if (args[i]->fix_fields(thd, tables, args + i) || args[i]->check_cols(1)) if (args[i]->fix_fields(thd, tables, args + i) || args[i]->check_cols(1))
return 1; return 1;
maybe_null |= args[i]->maybe_null; maybe_null |= args[i]->maybe_null;
} }
for (int i= 0 ; i < arg_count_field ; i++) for (i= 0 ; i < arg_count_field ; i++)
{ {
if (expr[i]->fix_fields(thd, tables, expr + i) || expr[i]->check_cols(1)) if (expr[i]->fix_fields(thd, tables, expr + i) || expr[i]->check_cols(1))
return 1; return 1;
...@@ -1655,7 +1657,7 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -1655,7 +1657,7 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
Fix fields for order clause in function: Fix fields for order clause in function:
GROUP_CONCAT(expr,... ORDER BY col,... ) GROUP_CONCAT(expr,... ORDER BY col,... )
*/ */
for (int i= 0 ; i < arg_count_order ; i++) for (i= 0 ; i < arg_count_order ; i++)
{ {
ORDER *order_item= order[i]; ORDER *order_item= order[i];
Item *item=*order_item->item; Item *item=*order_item->item;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment