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/my_os2cond.c | |
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/my_os2cond.c')
-rw-r--r-- | mysys/my_os2cond.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysys/my_os2cond.c b/mysys/my_os2cond.c index c436ad9a0e9..d930aadb2d1 100644 --- a/mysys/my_os2cond.c +++ b/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; |