merge with 3.23.42

config.guess:
  Auto merged
config.sub:
  Auto merged
ltconfig:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
include/errmsg.h:
  Auto merged
include/global.h:
  Auto merged
include/heap.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/isamlog.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
merge/open.c:
  Auto merged
myisam/ft_search.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_test_all.sh:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
myisam/sort.c:
  Auto merged
myisammrg/myrg_open.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_casecnv.c:
  Auto merged
mysys/mf_format.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/tree.c:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/err000001.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/overflow.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype.c:
  Auto merged
Docs/manual.texi:
  Change to 3.23 manual.
  (I will later add the changes for 4.0 to this copy)
client/mysql.cc:
  merge
client/mysqlbinlog.cc:
  merge
client/mysqldump.c:
  merge
client/mysqltest.c:
  merge
client/thread_test.c:
  merge
configure.in:
  merge
include/my_pthread.h:
  merge
include/mysqld_error.h:
  merge
libmysql/net.c:
  merge
myisam/mi_cache.c:
  merge
myisam/mi_check.c:
  merge
mysql-test/t/fulltext.test:
  merge
mysys/mf_qsort.c:
  merge
sql/lock.cc:
  merge
sql/md5.c:
  merge
sql/mini_client.cc:
  merge
sql/share/czech/errmsg.txt:
  merge
sql/share/danish/errmsg.txt:
  merge
sql/share/dutch/errmsg.txt:
  merge
sql/share/english/errmsg.txt:
  merge
sql/share/estonian/errmsg.txt:
  merge
sql/share/french/errmsg.txt:
  merge
sql/share/german/errmsg.txt:
  merge
sql/share/greek/errmsg.txt:
  merge
sql/share/hungarian/errmsg.txt:
  merge
sql/share/italian/errmsg.txt:
  merge
sql/share/japanese/errmsg.txt:
  merge
sql/share/korean/errmsg.txt:
  merge
sql/share/norwegian-ny/errmsg.txt:
  merge
sql/share/norwegian/errmsg.txt:
  merge
sql/share/polish/errmsg.txt:
  merge
sql/share/portuguese/errmsg.txt:
  merge
sql/share/romanian/errmsg.txt:
  merge
sql/share/russian/errmsg.txt:
  merge
sql/share/slovak/errmsg.txt:
  merge
sql/share/spanish/errmsg.txt:
  merge
sql/share/swedish/errmsg.txt:
  merge
sql/sql_load.cc:
  merge
sql/sql_repl.cc:
  merge

8 files changed, 19 insertions, 23 deletions

diff --git a/merge/_locking.c b/merge/_locking.c
index f90b41e2375..81582da1312 100644
--- a/merge/_locking.c
+++ b/merge/_locking.c
@@ -20,9 +20,7 @@
 
 #include "mrgdef.h"
 
-int mrg_lock_database(info,lock_type)
-MRG_INFO *info;
-int lock_type;
+int mrg_lock_database(MRG_INFO *info,int lock_type)
 {
   int error,new_error;
   MRG_TABLE *file;
diff --git a/merge/close.c b/merge/close.c
index 45aa889ef0c..2b769ade8e9 100644
--- a/merge/close.c
+++ b/merge/close.c
@@ -18,8 +18,7 @@
 
 #include "mrgdef.h"
 
-int mrg_close(info)
-register MRG_INFO *info;
+int mrg_close(register MRG_INFO *info)
 {
   int error=0,new_error;
   MRG_TABLE *file;
diff --git a/merge/create.c b/merge/create.c
index e7086210237..fd2c16f9ea2 100644
--- a/merge/create.c
+++ b/merge/create.c
@@ -23,8 +23,7 @@
 	   a NULL-pointer last
 	   */
 
-int mrg_create(name,table_names)
-const char *name,**table_names;
+int mrg_create(const char *name, const char**table_names)
 {
   int save_errno;
   uint errpos;
diff --git a/merge/extra.c b/merge/extra.c
index 343806dbfad..c4f048a4385 100644
--- a/merge/extra.c
+++ b/merge/extra.c
@@ -22,9 +22,9 @@
 
 #include "mrgdef.h"
 
-int mrg_extra(info,function)
-MRG_INFO *info;
-enum ha_extra_function function;
+int mrg_extra(
+MRG_INFO *info,
+enum ha_extra_function function)
 {
   MRG_TABLE *file;
 
diff --git a/merge/open.c b/merge/open.c
index 05f194b42d4..7b5e571b9ad 100644
--- a/merge/open.c
+++ b/merge/open.c
@@ -30,10 +30,10 @@
 */
 
 
-MRG_INFO *mrg_open(name,mode,handle_locking)
-const char *name;
-int mode;
-int handle_locking;
+MRG_INFO *mrg_open(
+const char *name,
+int mode,
+int handle_locking)
 {
   int save_errno,i,errpos;
   uint files,dir_length,length, options;
diff --git a/merge/panic.c b/merge/panic.c
index c3820fe468d..cf333e3a9bf 100644
--- a/merge/panic.c
+++ b/merge/panic.c
@@ -24,8 +24,8 @@
 	   done for all single user files to get changes in database */
 
 
-int mrg_panic(flag)
-enum ha_panic_function flag;
+int mrg_panic(
+enum ha_panic_function flag)
 {
   int error=0;
   LIST *list_element,*next_open;
diff --git a/merge/rsame.c b/merge/rsame.c
index a18f1771c37..4ebf25b21c1 100644
--- a/merge/rsame.c
+++ b/merge/rsame.c
@@ -17,10 +17,10 @@
 #include "mrgdef.h"
 
 
-int mrg_rsame(info,record,inx)
-MRG_INFO *info;
-byte *record;
-int inx;				/* not used, should be 0 */
+int mrg_rsame(
+MRG_INFO *info,
+byte *record,
+int inx)				/* not used, should be 0 */
 {
   if (inx)
   {
diff --git a/merge/update.c b/merge/update.c
index 64900b82116..9fcb82089e4 100644
--- a/merge/update.c
+++ b/merge/update.c
@@ -18,9 +18,9 @@
 
 #include "mrgdef.h"
 
-int mrg_update(info,oldrec,newrec)
-register MRG_INFO *info;
-const byte *oldrec,*newrec;
+int mrg_update(
+register MRG_INFO *info,
+const byte *oldrec, const byte *newrec)
 {
   if (!info->current_table)
   {