merge

Docs/manual.texi

@@ -46928,9 +46928,10 @@ not yet 100% confident in this code.
 @appendixsubsec Changes in release 3.23.52
 @itemize @bullet
 @item
-Changed behaviour that @code{IF(condition,column,NULL)} returns column type
+Fixed problem with @code{UNSIGNED BIGINT} on AIX.
 @item
-Fixed  a security bug with empty db column in db table
+Fixed security bug when having an empty databasename in the @code{user.db}
+table.
 @item
 Changed initialisation of @code{RND()} to make it less predicatable.
 @item

include/global.h

@@ -104,6 +104,8 @@
 #define _H_STRINGS
 #define _SYS_STREAM_H
 #define _AIX32_CURSES
+#define longlong2double(A) my_longlong2double(A)
+double my_longlong2double(unsigned long long A);
 #endif
 
 #ifdef HAVE_BROKEN_SNPRINTF	/* HPUX 10.20 don't have this defined */

include/my_no_pthread.h

@@ -21,7 +21,7 @@
   environment, easier to use.
 */
 
-#if !defined(_my_no_pthread_h) && !defined(THREADS)
+#if !defined(_my_no_pthread_h) && !defined(THREAD)
 #define _my_no_pthread_h
 
 #define pthread_mutex_init(A,B)

libmysql/Makefile.shared

@@ -57,7 +57,7 @@ mysysobjects1 =		my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
 			thr_mutex.lo mulalloc.lo string.lo default.lo \
 			my_compress.lo array.lo my_once.lo list.lo my_net.lo \
                         charset.lo hash.lo mf_iocache.lo my_seek.lo \
-			my_pread.lo mf_cache.lo my_gethostbyname.lo
+			my_pread.lo mf_cache.lo my_gethostbyname.lo my_port.lo
 # Not needed in the minimum library
 mysysobjects2 =		getopt.lo getopt1.lo getvar.lo my_lib.lo
 mysysobjects =		$(mysysobjects1) $(mysysobjects2)

mysql-test/mysql-test-run.sh

@@ -18,7 +18,7 @@ TZ=GMT-3; export TZ # for UNIX_TIMESTAMP tests to work
 # Program Definitions
 #--
 
-PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd:/usr/X11R6/bin
+PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd:/usr/X11R6/bin:/usr/bin/X11
 
 # Standard functions
 

mysql-test/r/bigint.result

@@ -10,4 +10,6 @@ a
 a
 18446744073709551615
 a
+18446744073709551615
+a
 18446744073709551614

mysql-test/r/func_if.result

@@ -34,4 +34,4 @@ aaa
 sum(if(num is null,0.00,num))
 144.54
 min(if(y -x > 5,y,NULL))	max(if(y - x > 5,y,NULL))
-6	56
+16	6

mysql-test/t/bigint.test

@@ -5,12 +5,18 @@ select 0,256,00000000000000065536,2147483647,-2147483648,2147483648,+4294967296;
 select 9223372036854775807,-009223372036854775808;
 select +9999999999999999999,-9999999999999999999;
 
+#
+# In 3.23 we have to disable the test of column to bigint as
+# this fails on AIX powerpc (the resolution for double is not good enough)
+# This will work on 4.0 as we then have internal handling of bigint variables.
+#
+
 drop table if exists t1;
 create table t1 (a bigint unsigned not null, primary key(a));
 insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE);
 select * from t1;
 select * from t1 where a=18446744073709551615;
-#select * from t1 where a='18446744073709551615';
+select * from t1 where a='18446744073709551615';
 delete from t1 where a=18446744073709551615;
 select * from t1;
 drop table t1;

mysys/Makefile.am

@@ -49,7 +49,7 @@ libmysys_a_SOURCES =	my_init.c my_getwd.c mf_getdate.c\
 			my_quick.c my_lockmem.c my_static.c \
 			getopt.c getopt1.c getvar.c my_mkdir.c \
 			default.c my_compress.c checksum.c raid.cc raid2.c \
-			my_net.c \
+			my_net.c my_port.c \
 			my_vsnprintf.c charset.c my_bitmap.c my_gethostbyname.c
 EXTRA_DIST =		thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
 			thr_mutex.c thr_rwlock.c

mysys/my_gethostbyname.c

@@ -18,7 +18,6 @@
 /* Thread safe version of gethostbyname_r() */
 
 #include "mysys_priv.h"
-#include "my_pthread.h"
 #include <assert.h>
 #if !defined(MSDOS) && !defined(__WIN__)
 #include <netdb.h>
@@ -28,11 +27,6 @@
 /* This file is not needed if my_gethostbyname_r is a macro */
 #if !defined(my_gethostbyname_r)
 
-#ifndef THREAD
-#define pthread_mutex_lock(A)
-#define pthread_mutex_unlock(A)
-#endif
-
 /*
   Emulate SOLARIS style calls, not because it's better, but just to make the
   usage of getbostbyname_r simpler.

mysys/my_init.c

@@ -21,9 +21,6 @@
 #include "m_ctype.h"
 #include <m_string.h>
 #include <m_ctype.h>
-#ifdef THREAD
-#include <my_pthread.h>
-#endif
 #ifdef HAVE_GETRUSAGE
 #include <sys/resource.h>
 /* extern int     getrusage(int, struct rusage *); */

mysys/my_net.c

@@ -34,11 +34,6 @@
 #endif
 #endif /* !defined(MSDOS) && !defined(__WIN__) */
 
-#ifndef THREAD
-#define pthread_mutex_lock(A)
-#define pthread_mutex_unlock(A)
-#endif
-
 void my_inet_ntoa(struct in_addr in, char *buf)
 {
   char *ptr;

mysys/my_os2cond.c

@@ -32,8 +32,8 @@
 
 int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
 {
-   APIRET          rc = 0;
-   HEV             event;
+   APIRET	   rc = 0;
+   HEV		   event;
    cond->waiting=0;
    /* Warp3 FP29 or Warp4 FP4 or better required */
    rc = DosCreateEventSem( NULL, &cond->semaphore, 0x0800, 0);
@@ -61,7 +61,7 @@ int pthread_cond_destroy(pthread_cond_t *cond)
 int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
 {
    APIRET   rc;
-   int      rval;
+   int	    rval;
 
    rval = 0;
    cond->waiting++;
@@ -80,13 +80,13 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
 }
 
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-                           struct timespec *abstime)
+			   struct timespec *abstime)
 {
   struct timeb curtime;
   int result;
   long timeout;
    APIRET   rc;
-   int      rval;
+   int	    rval;
 
    _ftime(&curtime);
    timeout= ((long) (abstime->ts_sec - curtime.time)*1000L +
@@ -123,13 +123,13 @@ int pthread_cond_signal(pthread_cond_t *cond)
 
 int pthread_cond_broadcast(pthread_cond_t *cond)
 {
-   int      i;
+   int	    i;
    APIRET   rc;
 
-                /*
-                 * Enter a loop to bring all threads off the
-                 * condition queue:
-                 */
+		/*
+		 * Enter a loop to bring all threads off the
+		 * condition queue:
+		 */
    i = cond->waiting;
    while (i--) rc = DosPostEventSem(cond->semaphore);
 
@@ -176,9 +176,9 @@ struct tm *localtime_r(const time_t *timep,struct tm *tmp)
   else
   {
     struct tm *res=localtime(timep);
-    if (!res)                                   /* Wrong date */
+    if (!res)					/* Wrong date */
     {
-      bzero(tmp,sizeof(*tmp));                  /* Keep things safe */
+      bzero(tmp,sizeof(*tmp));			/* Keep things safe */
       return 0;
     }
     *tmp= *res;

mysys/my_os2dirsrch.c

@@ -26,10 +26,10 @@
 
 long  _findfirst( char* path, struct _finddata_t* dos_file)
 {
-   HDIR           hdir = HDIR_CREATE;
-   APIRET         rc;
+   HDIR		  hdir = HDIR_CREATE;
+   APIRET	  rc;
    FILEFINDBUF3   buf3;
-   ULONG          entries = 1;
+   ULONG	  entries = 1;
 
 #ifdef _DEBUG
    printf( "_findfirst path %s\n", path);
@@ -37,13 +37,13 @@ long  _findfirst( char* path, struct _finddata_t* dos_file)
 
    memset( &buf3, 0, sizeof( buf3));
    rc = DosFindFirst(
-               path,  /*  Address of the ASCIIZ path name of the file or subdirectory to be found. */
-               &hdir,        /*  Address of the handle associated with this DosFindFirst request. */
-               FILE_NORMAL | FILE_DIRECTORY,  /*  Attribute value that determines the file objects to be searched for. */
-               &buf3,     /*  Result buffer. */
-               sizeof( buf3),        /*  The length, in bytes, of pfindbuf. */
-               &entries,  /*  Pointer to the number of entries: */
-               FIL_STANDARD);  /*  The level of file information required. */
+	       path,  /*  Address of the ASCIIZ path name of the file or subdirectory to be found. */
+	       &hdir,	     /*  Address of the handle associated with this DosFindFirst request. */
+	       FILE_NORMAL | FILE_DIRECTORY,  /*  Attribute value that determines the file objects to be searched for. */
+	       &buf3,	  /*  Result buffer. */
+	       sizeof( buf3),	     /*  The length, in bytes, of pfindbuf. */
+	       &entries,  /*  Pointer to the number of entries: */
+	       FIL_STANDARD);  /*  The level of file information required. */
 
 #ifdef _DEBUG
    printf( "_findfirst rc=%d hdir=%d entries=%d->%s\n", rc, hdir, entries, buf3.achName);
@@ -64,16 +64,16 @@ long  _findfirst( char* path, struct _finddata_t* dos_file)
 
 long  _findnext( long hdir, struct _finddata_t* dos_file)
 {
-   APIRET         rc;
+   APIRET	  rc;
    FILEFINDBUF3   buf3;
-   ULONG          entries = 1;
+   ULONG	  entries = 1;
 
    memset( &buf3, 0, sizeof( buf3));
    rc = DosFindNext(
-               hdir,
-               &buf3,     /*  Result buffer. */
-               sizeof( buf3),        /*  The length, in bytes, of pfindbuf. */
-               &entries);  /*  Pointer to the number of entries: */
+	       hdir,
+	       &buf3,	  /*  Result buffer. */
+	       sizeof( buf3),	     /*  The length, in bytes, of pfindbuf. */
+	       &entries);  /*  Pointer to the number of entries: */
 
 #ifdef _DEBUG
    printf( "_findnext rc=%d hdir=%d entries=%d->%s\n", rc, hdir, entries, buf3.achName);
@@ -93,7 +93,7 @@ long  _findnext( long hdir, struct _finddata_t* dos_file)
 
 void  _findclose( long hdir)
 {
-   APIRET         rc;
+   APIRET	  rc;
 
    rc = DosFindClose( hdir);
 #ifdef _DEBUG
@@ -105,8 +105,8 @@ DIR* opendir( char* path)
 {
    DIR* dir = (DIR*) calloc( 1, sizeof( DIR));
    char buffer[260];
-   APIRET         rc;
-   ULONG          entries = 1;
+   APIRET	  rc;
+   ULONG	  entries = 1;
 
    strcpy( buffer, path);
    strcat( buffer, "*.*");
@@ -118,13 +118,13 @@ DIR* opendir( char* path)
    dir->hdir = HDIR_CREATE;
    memset( &dir->buf3, 0, sizeof( dir->buf3));
    rc = DosFindFirst(
-               buffer,  /*  Address of the ASCIIZ path name of the file or subdirectory to be found. */
-               &dir->hdir,        /*  Address of the handle associated with this DosFindFirst request. */
-               FILE_NORMAL | FILE_DIRECTORY,  /*  Attribute value that determines the file objects to be searched for. */
-               &dir->buf3,     /*  Result buffer. */
-               sizeof( dir->buf3),        /*  The length, in bytes, of pfindbuf. */
-               &entries,  /*  Pointer to the number of entries: */
-               FIL_STANDARD);  /*  The level of file information required. */
+	       buffer,	/*  Address of the ASCIIZ path name of the file or subdirectory to be found. */
+	       &dir->hdir,	  /*  Address of the handle associated with this DosFindFirst request. */
+	       FILE_NORMAL | FILE_DIRECTORY,  /*  Attribute value that determines the file objects to be searched for. */
+	       &dir->buf3,     /*  Result buffer. */
+	       sizeof( dir->buf3),	  /*  The length, in bytes, of pfindbuf. */
+	       &entries,  /*  Pointer to the number of entries: */
+	       FIL_STANDARD);  /*  The level of file information required. */
 
 #ifdef _DEBUG
    printf( "opendir rc=%d hdir=%d entries=%d->%s\n", rc, dir->hdir, entries, dir->buf3.achName);
@@ -138,9 +138,9 @@ DIR* opendir( char* path)
 
 struct dirent* readdir( DIR* dir)
 {
-   APIRET         rc;
+   APIRET	  rc;
    //FILEFINDBUF3   buf3;
-   ULONG          entries = 1;
+   ULONG	  entries = 1;
 
    if (!dir->buf3.achName[0]) // file not found on previous query
       return NULL;
@@ -151,10 +151,10 @@ struct dirent* readdir( DIR* dir)
    // query next file
    memset( &dir->buf3, 0, sizeof( dir->buf3));
    rc = DosFindNext(
-               dir->hdir,
-               &dir->buf3,     /*  Result buffer. */
-               sizeof( dir->buf3),        /*  The length, in bytes, of pfindbuf. */
-               &entries);  /*  Pointer to the number of entries: */
+	       dir->hdir,
+	       &dir->buf3,     /*  Result buffer. */
+	       sizeof( dir->buf3),	  /*  The length, in bytes, of pfindbuf. */
+	       &entries);  /*  Pointer to the number of entries: */
 
 #ifdef _DEBUG
    printf( "_findnext rc=%d hdir=%d entries=%d->%s\n", rc, dir->hdir, entries, dir->buf3.achName);
@@ -168,7 +168,7 @@ struct dirent* readdir( DIR* dir)
 
 int closedir (DIR *dir)
 {
-   APIRET         rc;
+   APIRET	  rc;
 
    rc = DosFindClose( dir->hdir);
 #ifdef _DEBUG

mysys/my_os2dirsrch.h

@@ -30,9 +30,9 @@ extern "C" {
 struct _finddata_t
 {
 	unsigned	attrib;
-	//unsigned long	time_create;	/* -1 for FAT file systems */
-	//unsigned long	time_access;	/* -1 for FAT file systems */
-	//unsigned long	time_write;
+	//unsigned long time_create;	/* -1 for FAT file systems */
+	//unsigned long time_access;	/* -1 for FAT file systems */
+	//unsigned long time_write;
 	unsigned long	size;
 	char		name[260];
 	//uint16		wr_date;
@@ -42,10 +42,10 @@ struct _finddata_t
 struct dirent
 {
 	//unsigned	attrib;
-	//unsigned long	time_create;	/* -1 for FAT file systems */
-	//unsigned long	time_access;	/* -1 for FAT file systems */
-	//unsigned long	time_write;
-	//unsigned long	size;
+	//unsigned long time_create;	/* -1 for FAT file systems */
+	//unsigned long time_access;	/* -1 for FAT file systems */
+	//unsigned long time_write;
+	//unsigned long size;
 	char		d_name[260];
 	//uint16		wr_date;
 	//uint16		wr_time;
@@ -66,9 +66,9 @@ int closedir (DIR *);
 //#define _A_SUBDIR	FILE_DIRECTORY
 //#define _A_RDONLY	FILE_READONLY
 
-//long  _findfirst( char*, struct _finddata_t*);
-//long  _findnext( long, struct _finddata_t*);
-//void  _findclose( long);
+//long	_findfirst( char*, struct _finddata_t*);
+//long	_findnext( long, struct _finddata_t*);
+//void	_findclose( long);
 
 #ifdef __cplusplus_00
 }

mysys/my_os2dlfcn.c

@@ -34,7 +34,7 @@ char* dlerror( void);
 void* dlsym( void* hmod, char* fn);
 void  dlclose( void* hmod);
 
-char    fail[ 256];
+char	fail[ 256];
 
 void* dlopen( char* path, int flag)
 {
@@ -56,7 +56,7 @@ char* dlerror( void)
 void* dlsym( void* hmod, char* fn)
 {
    APIRET  rc;
-   PFN     addr;
+   PFN	   addr;
 
    rc = DosQueryProcAddr( (HMODULE) hmod, 0l, fn, &addr);
    if (rc)

mysys/my_os2mutex.c

@@ -72,8 +72,8 @@ pthread_mutex_destroy(pthread_mutex_t * mutex)
 int
 pthread_mutex_lock(pthread_mutex_t * mutex)
 {
-	int             ret = 0;
-	int             status = 0;
+	int		ret = 0;
+	int		status = 0;
 	APIRET		rc = 0;
 
    rc = DosRequestMutexSem(*mutex,SEM_INDEFINITE_WAIT);
@@ -86,9 +86,9 @@ pthread_mutex_lock(pthread_mutex_t * mutex)
 int
 pthread_mutex_unlock(pthread_mutex_t * mutex)
 {
-	int             ret = 0;
+	int		ret = 0;
 	APIRET		rc = 0;
-	int             status;
+	int		status;
 
    rc = DosReleaseMutexSem(*mutex);
 

mysys/my_os2thread.c

@@ -31,9 +31,9 @@ static pthread_mutex_t THR_LOCK_thread;
 
 struct pthread_map
 {
-  HANDLE          pthreadself;
+  HANDLE	  pthreadself;
   pthread_handler func;
-  void *          param;
+  void *	  param;
 };
 
 void win_pthread_init(void)
@@ -57,7 +57,7 @@ static pthread_handler_decl(pthread_start,param)
   pthread_handler func=((struct pthread_map *) param)->func;
   void *func_param=((struct pthread_map *) param)->param;
   my_thread_init();			/* Will always succeed in windows */
-  pthread_mutex_lock(&THR_LOCK_thread);	  /* Wait for beginthread to return */
+  pthread_mutex_lock(&THR_LOCK_thread);   /* Wait for beginthread to return */
   win_pthread_self=((struct pthread_map *) param)->pthreadself;
   pthread_mutex_unlock(&THR_LOCK_thread);
   free((char*) param);			  /* Free param from create */

mysys/my_os2tls.c

@@ -18,23 +18,23 @@
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
    MA 02111-1307, USA */
 
-DWORD    TlsAlloc( void);
-BOOL     TlsFree( DWORD);
-PVOID    TlsGetValue( DWORD);
-BOOL     TlsSetValue( DWORD, PVOID);
+DWORD	 TlsAlloc( void);
+BOOL	 TlsFree( DWORD);
+PVOID	 TlsGetValue( DWORD);
+BOOL	 TlsSetValue( DWORD, PVOID);
 
-#define TLS_MINIMUM_AVAILABLE   64
+#define TLS_MINIMUM_AVAILABLE	64
 
 
-PULONG           tls_storage;   /* TLS local storage */
-DWORD            tls_bits[2];   /* TLS in-use bits   */
-pthread_mutex_t  tls_mutex;     /* TLS mutex for in-use bits */
+PULONG		 tls_storage;	/* TLS local storage */
+DWORD		 tls_bits[2];	/* TLS in-use bits   */
+pthread_mutex_t  tls_mutex;	/* TLS mutex for in-use bits */
 
-DWORD    TlsAlloc( void)
+DWORD	 TlsAlloc( void)
 {
    DWORD index = -1;
    DWORD mask, tibidx;
-   int   i;
+   int	 i;
 
    if (tls_storage == NULL) {
 
@@ -43,12 +43,12 @@ DWORD    TlsAlloc( void)
       // allocate memory for TLS storage
       rc = DosAllocThreadLocalMemory( 1, &tls_storage);
       if (rc) {
-         fprintf( stderr, "DosAllocThreadLocalMemory error: return code = %u\n", rc);
+	 fprintf( stderr, "DosAllocThreadLocalMemory error: return code = %u\n", rc);
       }
 
       // create a mutex
       if (pthread_mutex_init( &tls_mutex, NULL))
-         fprintf( stderr, "Failed to init TLS mutex\n");
+	 fprintf( stderr, "Failed to init TLS mutex\n");
    }
 
    pthread_mutex_lock( &tls_mutex);
@@ -56,18 +56,18 @@ DWORD    TlsAlloc( void)
    tibidx = 0;
    if (tls_bits[0] == 0xFFFFFFFF) {
       if (tls_bits[1] == 0xFFFFFFFF) {
-            fprintf( stderr, "tid#%d, no more TLS bits available\n", _threadid);
-            pthread_mutex_unlock( &tls_mutex);
-            return -1;
+	    fprintf( stderr, "tid#%d, no more TLS bits available\n", _threadid);
+	    pthread_mutex_unlock( &tls_mutex);
+	    return -1;
       }
       tibidx = 1;
    }
    for( i=0; i<32; i++) {
       mask = (1 << i);
       if ((tls_bits[ tibidx] & mask) == 0) {
-         tls_bits[ tibidx] |= mask;
-         index = (tibidx*32) + i;
-         break;
+	 tls_bits[ tibidx] |= mask;
+	 index = (tibidx*32) + i;
+	 break;
       }
    }
    tls_storage[index] = 0;
@@ -79,9 +79,9 @@ DWORD    TlsAlloc( void)
    return index;
 }
 
-BOOL     TlsFree( DWORD index)
+BOOL	 TlsFree( DWORD index)
 {
-   int    tlsidx;
+   int	  tlsidx;
    DWORD  mask;
 
    if (index >= TLS_MINIMUM_AVAILABLE)
@@ -106,7 +106,7 @@ BOOL     TlsFree( DWORD index)
 }
 
 
-PVOID    TlsGetValue( DWORD index)
+PVOID	 TlsGetValue( DWORD index)
 {
    if (index >= TLS_MINIMUM_AVAILABLE)
       return NULL;
@@ -122,7 +122,7 @@ PVOID    TlsGetValue( DWORD index)
    return (PVOID) tls_array[ index];
 }
 
-BOOL     TlsSetValue( DWORD index, PVOID val)
+BOOL	 TlsSetValue( DWORD index, PVOID val)
 {
 
    // verify if memory has been allocated for this thread

mysys/my_port.c

+/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA */
+
+/* 
+   Small functions to make code portable
+*/
+
+#include "mysys_priv.h"
+
+#ifdef _AIX
+
+/*
+  On AIX, at least with gcc 3.1, the expression
+  '(double) (ulonglong) var' doesn't always work for big unsigned
+  integers like '18446744073709551615'.  The end result is that the
+  high bit is simply dropped. (probably bug in gcc optimizations)
+  Handling the conversion in a sub function seems to work.
+*/
+
+
+
+double my_longlong2double(unsigned long long nr)
+{
+  return (double) nr;
+}
+#endif /* _AIX */

mysys/mysys_priv.h

@@ -23,10 +23,10 @@
 #endif
 
 #ifdef THREAD
+#include <my_pthread.h>
 extern pthread_mutex_t THR_LOCK_malloc,THR_LOCK_open,THR_LOCK_keycache,
   THR_LOCK_lock,THR_LOCK_isam,THR_LOCK_net,THR_LOCK_charset;
 extern pthread_mutex_t LOCK_bitmap;
-#else /* THREAD */
-#define pthread_mutex_lock(A)
-#define pthread_mutex_unlock(A)
+#else
+#include <my_no_pthread.h>
 #endif

mysys/thr_rwlock.c

@@ -18,7 +18,6 @@
 /* Synchronization - readers / writer thread locks */
 
 #include "mysys_priv.h"
-#include <my_pthread.h>
 #if defined(THREAD) && !defined(HAVE_PTHREAD_RWLOCK_RDLOCK) && !defined(HAVE_RWLOCK_INIT)
 
 /*

sql/ha_innobase.cc

@@ -264,35 +264,46 @@ innobase_mysql_print_thd(
         void* input_thd)/* in: pointer to a MySQL THD object */
 {
   	THD*  thd;
-	char* old_buf = buf;
 
         thd = (THD*) input_thd;
 
-        buf += ut_sprintf(buf, "MySQL thread id %lu, query id %lu",
-                       thd->thread_id, thd->query_id);
-        if (thd->host) {
-                buf += ut_sprintf(buf, " %.30s", thd->host);
-        }
-
-        if (thd->ip) {
-                buf += ut_sprintf(buf, " %.20s", thd->ip);
-        }
+	/*  We can't use value of sprintf() as this is not portable */
+  	buf+= my_sprintf(buf,
+			 (buf, "MySQL thread id %lu",
+			  thd->thread_id));
+    	if (thd->host)
+	{
+	  *buf++=' ';
+	  buf=strnmov(buf, thd->host, 30);
+  	}
 
-        if (thd->user) {
-                buf += ut_sprintf(buf, " %.20s", thd->user);
-        }
+  	if (thd->ip)
+	{
+	  *buf++=' ';
+	  buf=strnmov(buf, thd->ip, 20);
+  	}
 
-        if (thd->proc_info) {
-                buf += ut_sprintf(buf, " %.50s", thd->proc_info);
-        }
+  	if (thd->user)
+	{
+	  *buf++=' ';
+	  buf=strnmov(buf, thd->user, 20);
+  	}
 
-        if (thd->query) {
-                buf += ut_sprintf(buf, "\n%.150s", thd->query);
-        }
+  	if (thd->proc_info)
+	{
+	  *buf++=' ';
+	  buf=strnmov(buf, thd->proc_info, 50);
+  	}
 
-        buf += ut_sprintf(buf, "\n");
+  	if (thd->query)
+	{
+	  *buf++='\n';
+	  buf=strnmov(buf, thd->query, 150);
+  	}  
+	buf[0]='\n';
+	buf[1]=0;
 
-	ut_a(strlen(old_buf) < 400);
+ 	ut_a(strlen(old_buf) < 400);
 }
 }
 

sql/item_cmpfunc.cc

@@ -494,12 +494,7 @@ Item_func_if::fix_length_and_dec()
   decimals=max(args[1]->decimals,args[2]->decimals);
   enum Item_result arg1_type=args[1]->result_type();
   enum Item_result arg2_type=args[2]->result_type();
-  bool null1=args[1]->null_value;
-  bool null2=args[2]->null_value;
-  if (null1 && !null2)
-    arg1_type=arg2_type;
-  else if (!null1 && null2)
-    arg2_type=arg1_type;
+
   binary=1;
   if (arg1_type == STRING_RESULT || arg2_type == STRING_RESULT)
   {

sql/mysqld.cc

@@ -43,6 +43,8 @@
 #if defined(HAVE_DEC_3_2_THREADS) || defined(SIGNALS_DONT_BREAK_READ)
 #define HAVE_CLOSE_SERVER_SOCK 1
 void close_server_sock();
+#else
+#define close_server_sock()
 #endif
 
 extern "C" {					// Because of SCO 3.2V4.2
@@ -465,9 +467,7 @@ static void close_connections(void)
     if (error != 0 && !count++)
       sql_print_error("Got error %d from pthread_cond_timedwait",error);
 #endif
-#if defined(HAVE_DEC_3_2_THREADS) || defined(SIGNALS_DONT_BREAK_READ)
     close_server_sock();
-#endif
   }
   (void) pthread_mutex_unlock(&LOCK_thread_count);
 #endif /* __WIN__ */
@@ -598,18 +598,26 @@ if (hPipe != INVALID_HANDLE_VALUE && opt_enable_named_pipe)
 void close_server_sock()
 {
   DBUG_ENTER("close_server_sock");
+
   if (ip_sock != INVALID_SOCKET)
   {
-    DBUG_PRINT("info",("closing TCP/IP socket"));
+    DBUG_PRINT("info",("calling shutdown on TCP/IP socket"));
     VOID(shutdown(ip_sock,2));
+#ifdef NOT_USED
+    /*
+      The following code is disabled as it cases MySQL to hang on
+      AIX 4.3 during shutdown
+    */
+    DBUG_PRINT("info",("calling closesocket on TCP/IP socket"));    
     VOID(closesocket(ip_sock));
+#endif
     ip_sock=INVALID_SOCKET;
   }
   if (unix_sock != INVALID_SOCKET)
   {
-    DBUG_PRINT("info",("closing Unix socket"));
+    DBUG_PRINT("info",("calling shutdown on unix socket"));
     VOID(shutdown(unix_sock,2));
-    VOID(closesocket(unix_sock));
+    DBUG_PRINT("info",("calling closesocket on unix socket"));
     VOID(unlink(mysql_unix_port));
     unix_sock=INVALID_SOCKET;
   }
@@ -621,7 +629,8 @@ void kill_mysql(void)
 {
   DBUG_ENTER("kill_mysql");
 #ifdef SIGNALS_DONT_BREAK_READ
-  close_server_sock(); /* force accept to wake up */
+  abort_loop=1;					// Break connection loops
+  close_server_sock();				// Force accept to wake up
 #endif 
 #if defined(__WIN__)
   {
@@ -647,10 +656,9 @@ void kill_mysql(void)
   DBUG_PRINT("quit",("After pthread_kill"));
   shutdown_in_progress=1;			// Safety if kill didn't work
 #ifdef SIGNALS_DONT_BREAK_READ    
-  if (!abort_loop)
+  if (!kill_in_progress)
   {
     pthread_t tmp;
-    abort_loop=1;
     if (pthread_create(&tmp,&connection_attrib, kill_server_thread,
 			   (void*) 0))
       sql_print_error("Error: Can't create thread to kill server");
@@ -1220,7 +1228,7 @@ static void sig_reload(int signo)
 
 static void sig_kill(int signo)
 {
-  if (!abort_loop)
+  if (!kill_in_progress)
   {
     abort_loop=1;				// mark abort for threads
     kill_server((void*) signo);