summaryrefslogtreecommitdiff
path: root/include/my_pthread.h
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-02-21 14:16:00 +0200
committerunknown <monty@donna.mysql.fi>2001-02-21 14:16:00 +0200
commit6839b1728d8f6abc12cf4e75363a5b4591ad392d (patch)
tree34f7d174c7e612bd03a5cf88fe4e2ac2411a33a4 /include/my_pthread.h
parent0897a73a267b86615395c2d770f95428be5057cf (diff)
downloadmariadb-git-6839b1728d8f6abc12cf4e75363a5b4591ad392d.tar.gz
Fixes for innobase
Added test for ALTER TABLE ORDER BY BUILD/FINISH.sh: Fixes for innobase BUILD/compile-pentium-debug: Fixes for innobase Docs/manual.texi: Fixes for innobase include/my_pthread.h: Fixes for innobase innobase/Makefile.am: Fixes for innobase innobase/btr/Makefile.am: Fixes for innobase innobase/data/Makefile.am: Fixes for innobase innobase/eval/Makefile.am: Fixes for innobase innobase/include/Makefile.i: Fixes for innobase innobase/os/Makefile.am: Fixes for innobase mysql-test/t/alter_table.test: Added test for ALTER TABLE ORDER BY mysys/my_error.c: Skip 'l' in '%lu' mysys/my_vsnprintf.c: cleanup sql/ha_innobase.cc: Fixed type + remove warnings sql/ha_innobase.h: Remove warnings sql/handler.cc: cleanup sql/sql_class.cc: remove warnings sql/sql_parse.cc: remove warnings sql/sql_table.cc: Fixed bug in ALTER TABLE ... ORDER BY BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'include/my_pthread.h')
-rw-r--r--include/my_pthread.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index c8d0d2c9d0a..3d011f61ca2 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -441,6 +441,7 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,
#define pthread_mutex_destroy(A) safe_mutex_destroy((A),__FILE__,__LINE__)
#define pthread_cond_wait(A,B) safe_cond_wait((A),(B),__FILE__,__LINE__)
#define pthread_cond_timedwait(A,B,C) safe_cond_timedwait((A),(B),(C),__FILE__,__LINE__)
+#define pthread_mutex_trylock(A) pthread_mutex_lock(A)
#define pthread_mutex_t safe_mutex_t
#endif /* SAFE_MUTEX */