summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-08-31 22:00:09 +0300
committerunknown <monty@donna.mysql.com>2000-08-31 22:00:09 +0300
commit5a95cfdd68544f1728f7c2d3e92220bcafb7ac1a (patch)
tree96f970afaa1f5743c4cb056f49e66b1d99eb2da4
parentae172fdcc0b77f28e1dc8c2f631e0d16aac086e6 (diff)
downloadmariadb-git-5a95cfdd68544f1728f7c2d3e92220bcafb7ac1a.tar.gz
Portability changes
Docs/manual.texi: Comment about timestamp include/my_pthread.h: Portability fix mysys/thr_rwlock.c: Fix for hpux
-rw-r--r--Docs/manual.texi2
-rw-r--r--include/my_pthread.h4
-rw-r--r--mysys/thr_rwlock.c5
3 files changed, 9 insertions, 2 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 86e1eed7ca3..e59c262a0e1 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -28286,6 +28286,8 @@ aren't specified.
You should have a primary key in the table.
@item
You should have a timestamp in all tables you want to be able to update.
+For maximum portability @code{TIMESTAMP(14)} or simple @code{TIMESTAMP}
+is recommended instead of other @code{TIMESTAMP(X)} variations.
@item
Only use double float fields. Access fails when comparing with single floats.
@item
diff --git a/include/my_pthread.h b/include/my_pthread.h
index bf6a0515ed2..19c39d76ef3 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -279,7 +279,7 @@ extern int my_pthread_create_detached;
#endif /* defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM) */
#if defined(_BSDI_VERSION) && _BSDI_VERSION < 199910
-int sigwait(const sigset_t *set, int *sig);
+int sigwait(sigset_t *set, int *sig);
#endif
#if defined(HAVE_UNIXWARE7_POSIX)
@@ -309,7 +309,7 @@ extern int my_pthread_cond_init(pthread_cond_t *mp,
#endif
#if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX)
-int sigwait(const sigset_t *setp, int *sigp); /* Use our implemention */
+int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */
#endif
#if !defined(HAVE_SIGSET) && !defined(HAVE_mit_thread) && !defined(sigset)
#define sigset(A,B) do { struct sigaction s; sigset_t set; \
diff --git a/mysys/thr_rwlock.c b/mysys/thr_rwlock.c
index 37630956e7f..dfa9065ff3a 100644
--- a/mysys/thr_rwlock.c
+++ b/mysys/thr_rwlock.c
@@ -65,8 +65,13 @@ int my_rwlock_init( rw_lock_t *rwp, void *arg __attribute__((unused)))
pthread_mutex_init( &rwp->lock, NULL );
pthread_condattr_init( &cond_attr );
+#ifdef HAVE_PTHREAD_CONDATTR_CREATE /* HPUX 11.0 */
+ pthread_cond_init( &rwp->readers, cond_attr );
+ pthread_cond_init( &rwp->writers, cond_attr );
+#else
pthread_cond_init( &rwp->readers, &cond_attr );
pthread_cond_init( &rwp->writers, &cond_attr );
+#endif
pthread_condattr_destroy(&cond_attr);
rwp->state = 0;