Commit 1aeb2a12 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi

Cleanup

parent 1ffff55f
...@@ -158,7 +158,7 @@ int mi_write(MI_INFO *info, byte *record) ...@@ -158,7 +158,7 @@ int mi_write(MI_INFO *info, byte *record)
{ {
if (info->bulk_insert) if (info->bulk_insert)
{ {
int j; uint j;
for (j=0 ; j < share->base.keys ; j++) for (j=0 ; j < share->base.keys ; j++)
{ {
if (is_tree_inited(& info->bulk_insert[j])) if (is_tree_inited(& info->bulk_insert[j]))
......
...@@ -24,7 +24,7 @@ noinst_HEADERS = bucomm.h debug.h ieee.h budbg.h demangle.h \ ...@@ -24,7 +24,7 @@ noinst_HEADERS = bucomm.h debug.h ieee.h budbg.h demangle.h \
linuxthreads.h pstack.h pstacktrace.h linuxthreads.h pstack.h pstacktrace.h
SRC= bucomm.c filemode.c linuxthreads.c rddbg.c \ SRC= bucomm.c filemode.c linuxthreads.c rddbg.c \
debug.c ieee.c pstack.c stabs.c debug.c ieee.c pstack.c stabs.c
EXTRA_DIST= $SRC EXTRA_DIST= $(SRC)
if COMPILE_PSTACK if COMPILE_PSTACK
pkglib_LIBRARIES = libpstack.a pkglib_LIBRARIES = libpstack.a
......
...@@ -312,7 +312,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, ...@@ -312,7 +312,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
#ifdef RESTRICTED_GROUP #ifdef RESTRICTED_GROUP
if (join.sum_func_count && !group && (join.func_count || join.field_count)) if (join.sum_func_count && !group && (join.func_count || join.field_count))
{ {
my_message(ER_WRONG_SUM_SELECT,ER(ER_WRONG_SUM_SELECT)); my_message(ER_WRONG_SUM_SELECT,ER(ER_WRONG_SUM_SELECT),MYF(0));
delete procedure; delete procedure;
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
......
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