diff options
| author | monty@hundin.mysql.fi <> | 2001-09-18 22:46:39 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-09-18 22:46:39 +0300 |
| commit | a439dccaec703cd3ed063b8c8f3e51aa08112a7f (patch) | |
| tree | b090e50e088250dd2b98e52a21c5e214239009a4 | |
| parent | 961b693327787df284c2d52b7228aabda6d2f8ac (diff) | |
| parent | 1aeb2a125cfde98c814a888d6d32f1bc8ec8bfbc (diff) | |
| download | mariadb-git-a439dccaec703cd3ed063b8c8f3e51aa08112a7f.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
| -rw-r--r-- | myisam/mi_write.c | 2 | ||||
| -rw-r--r-- | pstack/Makefile.am | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/myisam/mi_write.c b/myisam/mi_write.c index e1b147d02e9..096d5829fed 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -158,7 +158,7 @@ err: { if (info->bulk_insert) { - int j; + uint j; for (j=0 ; j < share->base.keys ; j++) { if (is_tree_inited(& info->bulk_insert[j])) diff --git a/pstack/Makefile.am b/pstack/Makefile.am index 86dddcb6f03..d94b3ba6aaf 100644 --- a/pstack/Makefile.am +++ b/pstack/Makefile.am @@ -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 diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 108f6aca1f2..3aa534222e7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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); } |