Commit a439dcca authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents 961b6933 1aeb2a12

myisam/mi_write.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int mi_write(MI_INFO *info, byte *record) 
  {

    if (info->bulk_insert)

    {

      int j;

      uint j;

      for (j=0 ; j < share->base.keys ; j++)

      {

        if (is_tree_inited(& info->bulk_insert[j]))

pstack/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ noinst_HEADERS = bucomm.h debug.h ieee.h budbg.h demangle.h \ 
			linuxthreads.h pstack.h pstacktrace.h

SRC=			bucomm.c filemode.c linuxthreads.c rddbg.c \

			debug.c ieee.c pstack.c stabs.c

EXTRA_DIST=		$SRC

EXTRA_DIST=		$(SRC)



if COMPILE_PSTACK

pkglib_LIBRARIES =	libpstack.a

sql/sql_select.cc

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, 
#ifdef RESTRICTED_GROUP

  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;

    DBUG_RETURN(-1);

  }