database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2001-09-18 22:46:39 +03:00
parent a5e44471ed 4d902c1ef6
commit a8b37644ec
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
myisam/mi_write.c
View File

@ -158,7 +158,7 @@ err:
{ {
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]))

2
pstack/Makefile.am
View File

@ -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

2
sql/sql_select.cc
View File

@ -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);
} }