After merge fix.

93a82f5d · bar@mysql.com/bar.myoffice.izhnet.ru · 66093b79 · 93a82f5d
Commit 93a82f5d authored Jun 22, 2007 by bar@mysql.com/bar.myoffice.izhnet.ru
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item_sum.cc sql/item_sum.cc +1 -1

No files found.
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -3239,7 +3239,7 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref)
    char *buf;
    String *new_separator;

-    if (!(buf= thd->stmt_arena->alloc(buflen)) ||
+    if (!(buf= (char*) thd->stmt_arena->alloc(buflen)) ||
        !(new_separator= new(thd->stmt_arena->mem_root)
                           String(buf, buflen, collation.collation)))
      return TRUE;