Fixes for Netware

Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL


BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75:
  Delete: sql/ChangeLog
BUILD/compile-pentium-valgrind-max:
  Don't use valgrind with safemalloc as this can hide some bugs
Makefile.am:
  Added platform dirs
bdb/os/os_handle.c:
  Portability fix
client/mysql.cc:
  Fixes for Netware.
  Fixed duplicate output when using 'tee'
  Simple optimisations
client/mysqldump.c:
  Portability fix
client/mysqltest.c:
  Portability fix
configure.in:
  Fixes for Netware
extra/resolveip.c:
  Fixes for Netware
include/Makefile.am:
  Fixes for Netware
include/config-win.h:
  Portability fix
include/my_global.h:
  Fixes for Netware
include/my_net.h:
  Fixes for Netware
include/my_pthread.h:
  Fixes for Netware
  Added detection of mutexes that was not destroyed
include/my_sys.h:
  Fixes for Netware
  Added 'extern' before external functions
include/mysql.h:
  Fixes for Netware
innobase/configure.in:
  Fixes for Netware
innobase/include/os0thread.h:
  Fixes for Netware
innobase/os/os0sync.c:
  Fixes for Netware
innobase/os/os0thread.c:
  Fixes for Netware
innobase/srv/srv0srv.c:
  Fixes for Netware
innobase/srv/srv0start.c:
  Fixes for Netware
innobase/sync/sync0sync.c:
  Fixes for Netware
isam/test3.c:
  Disable test on Netware
libmysql/Makefile.shared:
  Added my_sleep
libmysql/get_password.c:
  Fixes for Netware
libmysql/libmysql.c:
  Fixes for Netware
  Made mysql_once_init() global
libmysql/manager.c:
  Fixes for Netware
myisam/mi_test3.c:
  Disable test for netware
mysql-test/mysql-test-run.sh:
  Give warning if output file contains errors
mysql-test/r/count_distinct.result:
  More tests
mysql-test/r/group_by.result:
  Test of ORDER BY NULL
mysql-test/t/backup.test:
  Fixes for Netware
mysql-test/t/count_distinct.test:
  More tests
mysql-test/t/func_crypt.test:
  Fixes for Netware
mysql-test/t/grant_cache.test:
  Fixes for Netware
mysql-test/t/group_by.test:
  Tests of ORDER BY NULL
mysql-test/t/rpl000015.test:
  Fixes for Netware
mysql-test/t/rpl000017.test:
  Fixes for Netware
mysql-test/t/rpl_rotate_logs.test:
  Fixes for Netware
mysys/Makefile.am:
  Added my_sleep.c and my_netware.c
mysys/charset.c:
  Fixes for Netware
mysys/default.c:
  Fixes for Netware
mysys/mf_tempfile.c:
  Fixes for Netware
mysys/my_clock.c:
  Fixes for Netware
mysys/my_copy.c:
  Fixes for Netware
mysys/my_getwd.c:
  Changed function comment from // -> /* */
mysys/my_init.c:
  Fixes for Netware
mysys/my_lock.c:
  Fixes for Netware
mysys/my_messnc.c:
  Fixes for Netware
mysys/my_os2cond.c:
  Removed comment
mysys/my_os2dirsrch.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2dirsrch.h:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2file64.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2mutex.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2thread.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2tls.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_pthread.c:
  Fixes for Netware
mysys/my_redel.c:
  Fixes for Netware
mysys/my_tempnam.c:
  Fixes for Netware
mysys/my_thr_init.c:
  Remove created mutexes when program ends.
mysys/mysys_priv.h:
  Cleanup
mysys/safemalloc.c:
  Prefix error messages with "Error:"
mysys/thr_alarm.c:
  Destroy internal mutex on end_thr_alarm.
mysys/thr_mutex.c:
  Added detection of mutex on which one didn't call pthread_mutex_destroy()
scripts/make_binary_distribution.sh:
  Fixes for Netware
sql/des_key_file.cc:
  Free mutex at end
sql/ha_innodb.cc:
  Free mutex at end
sql/ha_myisam.cc:
  Changed warnings from REPAIR Note:
  (For mysql-test-run)
sql/hostname.cc:
  Fixes for Netware
sql/item.h:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/item_func.cc:
  Free used mutexes
sql/item_sum.cc:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/log.cc:
  Free used mutexes
sql/my_lock.c:
  Fixes for Netware
sql/mysql_priv.h:
  Fixes for Netware
sql/mysqld.cc:
  Fixes for Netware
  Added Have_crypt
  Properly free mutexes from MYSQL_LOG by calling cleanup
  Free mutex before exit
sql/repl_failsafe.cc:
  Fixes for Netware
sql/set_var.cc:
  Added have_crypt
sql/share/english/errmsg.txt:
  Added version socket and port to stderr log
sql/slave.cc:
  Remove global MASTER_INFO variable and use instead an allocated variable.
  This allows us to correctly free used mutex.
sql/slave.h:
  Move constructors and destuctors to slave.cc
  (To make it easier to clear all needed variables)
sql/sql_base.cc:
  Safety fix
sql/sql_class.h:
  Portability fixes.
  Added 'cleanup' to log handling to be able to free mutexes.
sql/sql_insert.cc:
  Fixes for Netware
mysys/my_sleep.c:
  E
sql/sql_parse.cc:
  Fixes for Netware
sql/sql_select.cc:
  Added optimisation for ORDER BY NULL
sql/sql_select.h:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/sql_table.cc:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/sql_udf.cc:
  Free mutex on end
vio/test-ssl.c:
  Simple code cleanup
vio/test-sslclient.c:
  Simple code cleanup
vio/test-sslserver.c:
  Simple code cleanup
vio/viotest-ssl.c:
  Simple code cleanup

1 files changed, 92 insertions, 90 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 */