Merge with 4.0.11

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Makefile.am:
  Auto merged
bdb/os/os_handle.c:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
myisam/ft_static.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_test3.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/handler.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/count_distinct.test:
  Auto merged
mysql-test/t/func_crypt.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/table.cc:
  Auto merged
Docs/manual.texi:
  Use remote version
client/mysql.cc:
  Merge
configure.in:
  Merge
libmysql/libmysql.c:
  Merge
libmysqld/lib_sql.cc:
  Merge
myisam/ft_stopwords.c:
  Merge
myisam/myisamchk.c:
  Merge
mysql-test/r/bigint.result:
  Merge
mysql-test/r/group_by.result:
  Merge
mysql-test/r/rpl000009.result:
  Merge
mysql-test/t/group_by.test:
  Merge
mysql-test/t/rpl000009.test:
  Merge
mysql-test/t/rpl_rotate_logs.test:
  Merge
mysys/Makefile.am:
  Merge
mysys/charset.c:
  Merge
sql/item.h:
  Merge
sql/item_cmpfunc.cc:
  Merge
sql/item_cmpfunc.h:
  Merge
sql/item_create.cc:
  Merge
sql/item_func.cc:
  Merge
sql/item_strfunc.h:
  Merge
sql/log.cc:
  Merge
sql/mysql_priv.h:
  Merge
sql/mysqld.cc:
  Merge
sql/protocol.cc:
  Merge
sql/slave.cc:
  Merge
sql/sql_class.h:
  Merge
sql/sql_db.cc:
  Merge
sql/sql_handler.cc:
  Merge
sql/sql_parse.cc:
  Merge
sql/sql_select.cc:
  Merge
sql/sql_yacc.yy:
  Merge

4 files changed, 192 insertions, 200 deletions

diff --git a/vio/test-ssl.c b/vio/test-ssl.c
index acce201bfba..84bae5fa0c7 100644
--- a/vio/test-ssl.c
+++ b/vio/test-ssl.c
@@ -22,9 +22,6 @@
 #include "mysql.h"
 #include "errmsg.h"
 #include <my_dir.h>
-#ifndef __GNU_LIBRARY__
-#define __GNU_LIBRARY__               // Skip warnings in getopt.h
-#endif
 #include <my_getopt.h>
 #include <signal.h>
 #include <violite.h>
@@ -50,95 +47,100 @@ print_usage()
 	printf("viossl-test server-key server-cert client-key client-cert [CAfile] [CApath]\n");
 }
 
+
 int
-main(	int	argc,
-	char**	argv)
+main(int argc, char**	argv)
 {
-	char*	server_key = 0,	*server_cert = 0;
-	char*	client_key = 0,	*client_cert = 0;
-	char*	ca_file = 0,	*ca_path = 0;
-	char*	cipher=0;
-	int	child_pid,sv[2];
-	my_bool unused;
-	struct st_VioSSLAcceptorFd* ssl_acceptor=0;
-	struct st_VioSSLConnectorFd* ssl_connector=0; 
-	Vio* client_vio=0, *server_vio=0;
-	MY_INIT(argv[0]);
-        DBUG_PROCESS(argv[0]);
-        DBUG_PUSH(default_dbug_option);
-
-	if (argc<5)
-	{
-		print_usage();
-		return 1;
-	}
-
-	server_key = argv[1];
-	server_cert = argv[2];
-	client_key = argv[3];
-	client_cert = argv[4];
-	if (argc>5)
-		ca_file = argv[5];
-	if (argc>6)
-		ca_path = argv[6];
-	printf("Server key/cert : %s/%s\n", server_key, server_cert);
-	printf("Client key/cert : %s/%s\n", client_key, client_cert);
-	if (ca_file!=0)
-		printf("CAfile          : %s\n", ca_file);
-	if (ca_path!=0)
-		printf("CApath          : %s\n", ca_path);
-
-
-	if (socketpair(PF_UNIX, SOCK_STREAM, IPPROTO_IP, sv)==-1)
-		fatal_error("socketpair");
-
-        ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file, ca_path, cipher);
-	ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file, ca_path, cipher);
-
-	client_vio = (struct st_vio*)my_malloc(sizeof(struct st_vio),MYF(0));
-        client_vio->sd = sv[0];
-	client_vio->vioblocking(client_vio, 0, &unused);
-        sslconnect(ssl_connector,client_vio,60L);
-	server_vio = (struct st_vio*)my_malloc(sizeof(struct st_vio),MYF(0));
-        server_vio->sd = sv[1];
-	server_vio->vioblocking(client_vio, 0, &unused);
-        sslaccept(ssl_acceptor,server_vio,60L);
-
-	printf("Socketpair: %d , %d\n", client_vio->sd, server_vio->sd);
-
-	child_pid = fork();
-	if (child_pid==-1) {
-		my_free((gptr)ssl_acceptor,MYF(0));
-		my_free((gptr)ssl_connector,MYF(0));
-		fatal_error("fork");
-	}
-	if (child_pid==0) {
-		//child, therefore, client
-		char	xbuf[100];
-		int	r = client_vio->read(client_vio,xbuf, sizeof(xbuf));
-		if (r<=0) {
-        		my_free((gptr)ssl_acceptor,MYF(0));
-	      		my_free((gptr)ssl_connector,MYF(0));
-			fatal_error("client:SSL_read");
-		}
-		xbuf[r] = 0;
-		printf("client:got %s\n", xbuf);
-		my_free((gptr)client_vio,MYF(0));
-		my_free((gptr)ssl_acceptor,MYF(0));
-		my_free((gptr)ssl_connector,MYF(0));
-	} else {
-		const char*	s = "Huhuhuh";
-		int		r = server_vio->write(server_vio,(gptr)s, strlen(s));
-		if (r<=0) {
-  	 		my_free((gptr)ssl_acceptor,MYF(0));
-			my_free((gptr)ssl_connector,MYF(0));
-			fatal_error("server:SSL_write");
-		}
-		my_free((gptr)server_vio,MYF(0));
-		my_free((gptr)ssl_acceptor,MYF(0));
-		my_free((gptr)ssl_connector,MYF(0));
-	}
-	return 0;
+  char*	server_key = 0,	*server_cert = 0;
+  char*	client_key = 0,	*client_cert = 0;
+  char*	ca_file = 0,	*ca_path = 0;
+  char*	cipher=0;
+  int	child_pid,sv[2];
+  my_bool unused;
+  struct st_VioSSLAcceptorFd* ssl_acceptor=0;
+  struct st_VioSSLConnectorFd* ssl_connector=0; 
+  Vio* client_vio=0, *server_vio=0;
+  MY_INIT(argv[0]);
+  DBUG_PROCESS(argv[0]);
+  DBUG_PUSH(default_dbug_option);
+
+  if (argc<5)
+  {
+    print_usage();
+    return 1;
+  }
+
+  server_key = argv[1];
+  server_cert = argv[2];
+  client_key = argv[3];
+  client_cert = argv[4];
+  if (argc>5)
+    ca_file = argv[5];
+  if (argc>6)
+    ca_path = argv[6];
+  printf("Server key/cert : %s/%s\n", server_key, server_cert);
+  printf("Client key/cert : %s/%s\n", client_key, client_cert);
+  if (ca_file!=0)
+    printf("CAfile          : %s\n", ca_file);
+  if (ca_path!=0)
+    printf("CApath          : %s\n", ca_path);
+
+
+  if (socketpair(PF_UNIX, SOCK_STREAM, IPPROTO_IP, sv)==-1)
+    fatal_error("socketpair");
+
+  ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file,
+				      ca_path, cipher);
+  ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file,
+					ca_path, cipher);
+
+  client_vio = (struct st_vio*)my_malloc(sizeof(struct st_vio),MYF(0));
+  client_vio->sd = sv[0];
+  client_vio->vioblocking(client_vio, 0, &unused);
+  sslconnect(ssl_connector,client_vio,60L);
+  server_vio = (struct st_vio*)my_malloc(sizeof(struct st_vio),MYF(0));
+  server_vio->sd = sv[1];
+  server_vio->vioblocking(client_vio, 0, &unused);
+  sslaccept(ssl_acceptor,server_vio,60L);
+
+  printf("Socketpair: %d , %d\n", client_vio->sd, server_vio->sd);
+
+  child_pid = fork();
+  if (child_pid==-1) {
+    my_free((gptr)ssl_acceptor,MYF(0));
+    my_free((gptr)ssl_connector,MYF(0));
+    fatal_error("fork");
+  }
+  if (child_pid==0)
+  {
+    /* child, therefore, client */
+    char	xbuf[100];
+    int	r = client_vio->read(client_vio,xbuf, sizeof(xbuf));
+    if (r<=0) {
+      my_free((gptr)ssl_acceptor,MYF(0));
+      my_free((gptr)ssl_connector,MYF(0));
+      fatal_error("client:SSL_read");
+    }
+    xbuf[r] = 0;
+    printf("client:got %s\n", xbuf);
+    my_free((gptr)client_vio,MYF(0));
+    my_free((gptr)ssl_acceptor,MYF(0));
+    my_free((gptr)ssl_connector,MYF(0));
+  }
+  else
+  {
+    const char*	s = "Huhuhuh";
+    int		r = server_vio->write(server_vio,(gptr)s, strlen(s));
+    if (r<=0) {
+      my_free((gptr)ssl_acceptor,MYF(0));
+      my_free((gptr)ssl_connector,MYF(0));
+      fatal_error("server:SSL_write");
+    }
+    my_free((gptr)server_vio,MYF(0));
+    my_free((gptr)ssl_acceptor,MYF(0));
+    my_free((gptr)ssl_connector,MYF(0));
+  }
+  return 0;
 }
 #else /* HAVE_OPENSSL */
 
diff --git a/vio/test-sslclient.c b/vio/test-sslclient.c
index 84853e45485..231ce056d8c 100644
--- a/vio/test-sslclient.c
+++ b/vio/test-sslclient.c
@@ -22,9 +22,6 @@
 #include "mysql.h"
 #include "errmsg.h"
 #include <my_dir.h>
-#ifndef __GNU_LIBRARY__
-#define __GNU_LIBRARY__               // Skip warnings in getopt.h
-#endif
 #include <my_getopt.h>
 #include <signal.h>
 #include <violite.h>
diff --git a/vio/test-sslserver.c b/vio/test-sslserver.c
index f0116a2817d..71b194838c7 100644
--- a/vio/test-sslserver.c
+++ b/vio/test-sslserver.c
@@ -22,9 +22,6 @@
 #include "mysql.h"
 #include "errmsg.h"
 #include <my_dir.h>
-#ifndef __GNU_LIBRARY__
-#define __GNU_LIBRARY__               // Skip warnings in getopt.h
-#endif
 #include <my_getopt.h>
 #include <signal.h>
 #include <violite.h>
diff --git a/vio/viotest-ssl.c b/vio/viotest-ssl.c
index 1a766a3fc97..b4a191a1e2f 100644
--- a/vio/viotest-ssl.c
+++ b/vio/viotest-ssl.c
@@ -22,11 +22,7 @@
 #include "mysql.h"
 #include "errmsg.h"
 #include <my_dir.h>
-#ifndef __GNU_LIBRARY__
-#define __GNU_LIBRARY__               // Skip warnings in getopt.h
-#endif
 #include <my_getopt.h>
-//#include "my_readline.h"
 #include <signal.h>
 #include <violite.h>
 
@@ -38,115 +34,115 @@ const char *default_dbug_option="d:t:O,/tmp/viotest-ssl.trace";
 #endif
 
 void
-fatal_error(	const char*	r)
+fatal_error(const char *r)
 {
-	perror(r);
-	exit(0);
+  perror(r);
+  exit(0);
 }
 
 void
 print_usage()
 {
-	printf("viossl-test: testing SSL virtual IO. Usage:\n");
-	printf("viossl-test server-key server-cert client-key client-cert [CAfile] [CApath]\n");
+  printf("viossl-test: testing SSL virtual IO. Usage:\n");
+  printf("viossl-test server-key server-cert client-key client-cert [CAfile] [CApath]\n");
 }
 
-int
-main(	int	argc,
-	char**	argv)
+
+int main(int argc, char **argv)
 {
-	char*	server_key = 0;
-	char*	server_cert = 0;
-	char*	client_key = 0;
-	char*	client_cert = 0;
-	char*	ca_file = 0;
-	char*	ca_path = 0;
-	int	child_pid,sv[2];
-	struct st_VioSSLAcceptorFd* ssl_acceptor=0;
-	struct st_VioSSLConnectorFd* ssl_connector=0; 
-	Vio* client_vio=0;
-	Vio* server_vio=0;
-	MY_INIT(argv[0]);
-//        DBUG_ENTER("main");
-        DBUG_PROCESS(argv[0]);
-        DBUG_PUSH(default_dbug_option);
-
-
-
-	if (argc<5)
-	{
-		print_usage();
-		return 1;
-	}
-
-	server_key = argv[1];
-	server_cert = argv[2];
-	client_key = argv[3];
-	client_cert = argv[4];
-	if (argc>5)
-		ca_file = argv[5];
-	if (argc>6)
-		ca_path = argv[6];
-	printf("Server key/cert : %s/%s\n", server_key, server_cert);
-	printf("Client key/cert : %s/%s\n", client_key, client_cert);
-	if (ca_file!=0)
-		printf("CAfile          : %s\n", ca_file);
-	if (ca_path!=0)
-		printf("CApath          : %s\n", ca_path);
-
-
-	if (socketpair(PF_UNIX, SOCK_STREAM, IPPROTO_IP, sv)==-1)
-		fatal_error("socketpair");
-
-        ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file, ca_path);
-	ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file, ca_path);
-
-	client_vio = (Vio*)my_malloc(sizeof(struct st_vio),MYF(0));
-        client_vio->sd = sv[0];
-        sslconnect(ssl_connector,client_vio);
-	server_vio = (Vio*)my_malloc(sizeof(struct st_vio),MYF(0));
-        server_vio->sd = sv[1];
-        sslaccept(ssl_acceptor,server_vio);
-
-	printf("Socketpair: %d , %d\n", client_vio->sd, server_vio->sd);
-
-	child_pid = fork();
-	if (child_pid==-1) {
-		my_free((gptr)ssl_acceptor,MYF(0));
-		my_free((gptr)ssl_connector,MYF(0));
-		fatal_error("fork");
-	}
-	if (child_pid==0) {
-		//child, therefore, client
-		char	xbuf[100];
-		int	r = vio_ssl_read(client_vio,xbuf, sizeof(xbuf));
-		if (r<=0) {
-        		my_free((gptr)ssl_acceptor,MYF(0));
-	      		my_free((gptr)ssl_connector,MYF(0));
-			fatal_error("client:SSL_read");
-		}
-//        printf("*** client cipher %s\n",client_vio->cipher_description());
-		xbuf[r] = 0;
-		printf("client:got %s\n", xbuf);
-		my_free((gptr)client_vio,MYF(0));
-		my_free((gptr)ssl_acceptor,MYF(0));
-		my_free((gptr)ssl_connector,MYF(0));
-		sleep(1);
-	} else {
-		const char*	s = "Huhuhuh";
-		int		r = vio_ssl_write(server_vio,(gptr)s, strlen(s));
-		if (r<=0) {
-  	 		my_free((gptr)ssl_acceptor,MYF(0));
-			my_free((gptr)ssl_connector,MYF(0));
-			fatal_error("server:SSL_write");
-		}
-//        printf("*** server cipher %s\n",server_vio->cipher_description());
-		my_free((gptr)server_vio,MYF(0));
-		my_free((gptr)ssl_acceptor,MYF(0));
-		my_free((gptr)ssl_connector,MYF(0));
-		sleep(1);
-	}
-	return 0;
+  char*	server_key = 0;
+  char*	server_cert = 0;
+  char*	client_key = 0;
+  char*	client_cert = 0;
+  char*	ca_file = 0;
+  char*	ca_path = 0;
+  int	child_pid,sv[2];
+  struct st_VioSSLAcceptorFd* ssl_acceptor=0;
+  struct st_VioSSLConnectorFd* ssl_connector=0; 
+  Vio* client_vio=0;
+  Vio* server_vio=0;
+  MY_INIT(argv[0]);
+  DBUG_PROCESS(argv[0]);
+  DBUG_PUSH(default_dbug_option);
+
+  if (argc<5)
+  {
+    print_usage();
+    return 1;
+  }
+
+  server_key = argv[1];
+  server_cert = argv[2];
+  client_key = argv[3];
+  client_cert = argv[4];
+  if (argc>5)
+    ca_file = argv[5];
+  if (argc>6)
+    ca_path = argv[6];
+  printf("Server key/cert : %s/%s\n", server_key, server_cert);
+  printf("Client key/cert : %s/%s\n", client_key, client_cert);
+  if (ca_file!=0)
+    printf("CAfile          : %s\n", ca_file);
+  if (ca_path!=0)
+    printf("CApath          : %s\n", ca_path);
+
+
+  if (socketpair(PF_UNIX, SOCK_STREAM, IPPROTO_IP, sv)==-1)
+    fatal_error("socketpair");
+
+  ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file,
+				      ca_path);
+  ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file,
+					ca_path);
+
+  client_vio = (Vio*)my_malloc(sizeof(struct st_vio),MYF(0));
+  client_vio->sd = sv[0];
+  sslconnect(ssl_connector,client_vio);
+  server_vio = (Vio*)my_malloc(sizeof(struct st_vio),MYF(0));
+  server_vio->sd = sv[1];
+  sslaccept(ssl_acceptor,server_vio);
+
+  printf("Socketpair: %d , %d\n", client_vio->sd, server_vio->sd);
+
+  child_pid = fork();
+  if (child_pid==-1)
+  {
+    my_free((gptr)ssl_acceptor,MYF(0));
+    my_free((gptr)ssl_connector,MYF(0));
+    fatal_error("fork");
+  }
+  if (child_pid==0)
+  {
+    /* child, therefore, client */
+    char	xbuf[100];
+    int	r = vio_ssl_read(client_vio,xbuf, sizeof(xbuf));
+    if (r<=0) {
+      my_free((gptr)ssl_acceptor,MYF(0));
+      my_free((gptr)ssl_connector,MYF(0));
+      fatal_error("client:SSL_read");
+    }
+    xbuf[r] = 0;
+    printf("client:got %s\n", xbuf);
+    my_free((gptr)client_vio,MYF(0));
+    my_free((gptr)ssl_acceptor,MYF(0));
+    my_free((gptr)ssl_connector,MYF(0));
+    sleep(1);
+  }
+  else
+  {
+    const char*	s = "Huhuhuh";
+    int		r = vio_ssl_write(server_vio,(gptr)s, strlen(s));
+    if (r<=0) {
+      my_free((gptr)ssl_acceptor,MYF(0));
+      my_free((gptr)ssl_connector,MYF(0));
+      fatal_error("server:SSL_write");
+    }
+    my_free((gptr)server_vio,MYF(0));
+    my_free((gptr)ssl_acceptor,MYF(0));
+    my_free((gptr)ssl_connector,MYF(0));
+    sleep(1);
+  }
+  return 0;
 }
 #else /* HAVE_OPENSSL */