diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-22 15:33:34 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-22 15:33:34 +0200 |
| commit | 3e54e5393293426a9bfb7e6036f7e12bdb71d3b5 (patch) | |
| tree | ccd9b5c441de00d24eee19f6c4a55a4b4b7bfc6d /include | |
| parent | 6632102983d7f413d77f3f735ec8b22f5ffdcdaf (diff) | |
| download | mariadb-git-3e54e5393293426a9bfb7e6036f7e12bdb71d3b5.tar.gz | |
Fixes for OSF1
Made test more reliable on slow machines
Docs/manual.texi:
Changelog
client/mysqladmin.c:
Made --silent more silent
include/my_pthread.h:
Removed warning on OSF1
mysql-test/install_test_db.sh:
Allow connections from 127.0.0.1
mysql-test/mysql-test-run.sh:
Use mysqladmin ping to test if server is up
mysql-test/r/rpl000015.result:
Added sleep to make results repeatable
mysql-test/t/rpl000015.test:
Added sleep to make results repeatable
mysql-test/t/rpl000016.test:
Added sleep to make results repeatable
sql/sql_repl.cc:
added DBUG entry
sql/sql_table.cc:
Removed comparison of virtual functions as this didn't work on
Compaq C++ on OSF1
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 6a5b8dcf5eb..c8d0d2c9d0a 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -433,6 +433,8 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp, #undef pthread_mutex_wait #undef pthread_mutex_timedwait #undef pthread_mutex_t +#undef pthread_cond_wait +#undef pthread_cond_timedwait #define pthread_mutex_init(A,B) safe_mutex_init((A),(B)) #define pthread_mutex_lock(A) safe_mutex_lock((A),__FILE__,__LINE__) #define pthread_mutex_unlock(A) safe_mutex_unlock((A),__FILE__,__LINE__) |