diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-12 03:28:02 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-12 03:28:02 +0300 |
| commit | b2e946136d21ec3102b3204ef1e2a1a10b404ff3 (patch) | |
| tree | 34d4d5eb2aef4b99d0518f461da41a331af8574e /mysys/mysys_priv.h | |
| parent | 49e4fea6c9f64f692b941589fd86158bf3e76a10 (diff) | |
| download | mariadb-git-b2e946136d21ec3102b3204ef1e2a1a10b404ff3.tar.gz | |
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.
Docs/manual.texi:
Changelog
include/global.h:
Fix for BIGINT problem on AIX
include/my_no_pthread.h:
Fixed typo
libmysql/Makefile.shared:
Fix for BIGINT problem on AIX
mysql-test/mysql-test-run.sh:
Fix to find xterm on AIX 4.3
mysql-test/r/bigint.result:
Fix for BIGINT problem on AIX
mysql-test/r/func_if.result:
Change results for IF() after reverting change.
mysql-test/t/bigint.test:
Fix for BIGINT problem on AIX
mysys/Makefile.am:
Fix for BIGINT problem on AIX
mysys/my_gethostbyname.c:
Cleanup
mysys/my_init.c:
Cleanup
mysys/my_net.c:
Cleanup
mysys/my_os2cond.c:
Space & CRLF cleanup
mysys/my_os2dirsrch.c:
Space & CRLF cleanup
mysys/my_os2dirsrch.h:
Space & CRLF cleanup
mysys/my_os2dlfcn.c:
Space & CRLF cleanup
mysys/my_os2file64.c:
Space & CRLF cleanup
mysys/my_os2mutex.c:
Space & CRLF cleanup
mysys/my_os2thread.c:
Space & CRLF cleanup
mysys/my_os2tls.c:
Space & CRLF cleanup
mysys/mysys_priv.h:
cleanup
mysys/thr_rwlock.c:
cleanup
sql/ha_innobase.cc:
Removed usage of sprintf()
Fixed missing end \0 which caused control characters to appear in SHOW INNODB STATUS
sql/item_cmpfunc.cc:
Reverted change for IF()
sql/mysqld.cc:
Fix for shutdown on AIX
Diffstat (limited to 'mysys/mysys_priv.h')
| -rw-r--r-- | mysys/mysys_priv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index 20fda270658..2049347cb36 100644 --- a/mysys/mysys_priv.h +++ b/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 |