Commit b779b638 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fixed problem with BIGINT and shutdown on AIX 

Moved IF(test,column,NULL) code to 4.0
Changed mysys_priv.h to include my_pthread.h or my_no_pthread.h.
Removed some CR's in os2 files.
parent 0005f28b

Docs/manual.texi

+3 −2
Original line number Diff line number Diff line
@@ -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

+2 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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