Merge with 3.23.42

configure.in:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
heap/hp_test2.c:
  Auto merged
include/global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql/net.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
Docs/manual.texi:
  merge
myisam/myisampack.c:
  merge

1 files changed, 4 insertions, 11 deletions

diff --git a/extra/comp_err.c b/extra/comp_err.c
index 198bdffb0db..f7b68ff0891 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -119,9 +119,7 @@ int main(int argc,char *argv[])
 
 	/* Read options */
 
-static void get_options(argc,argv)
-register int *argc;
-register char **argv[];
+static void get_options(register int *argc,register char **argv[])
 {
   int help=0;
   char *pos,*progname;
@@ -163,9 +161,7 @@ register char **argv[];
 
 	/* Count rows in from-file until row that start with char is found */
 
-static int count_rows(from,c,c2)
-FILE *from;
-pchar c,c2;
+static int count_rows(FILE *from, pchar c, pchar c2)
 {
   int count;
   long pos;
@@ -189,9 +185,7 @@ pchar c,c2;
 	/* Read rows and remember them until row that start with char */
 	/* Converts row as a C-compiler would convert a textstring */
 
-static int remember_rows(from,c)
-FILE *from;
-pchar c;
+static int remember_rows(FILE* from, pchar c)
 {
   int i,nr,start_count,found_end;
   char row[MAXLENGTH],*pos;
@@ -253,8 +247,7 @@ pchar c;
 	/* Copy rows from memory to file and remember position */
 
 
-static int copy_rows(to)
-FILE *to;
+static int copy_rows(FILE *to)
 {
   int row_nr;
   long start_pos;