mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches
client/mysql.cc: NetWare only: Remove pthread_yield on large screen results client/mysqldump.c: NetWare only: Remove pthread_yield on large screen results include/my_pthread.h: NetWare only: pthread_cond_timedwait now present in LibC mysys/default.c: Add conditional for NetWare mysys/my_init.c: Changes to netware_init mysys/my_pthread.c: NetWare only: special my_pthread_cond_timedwait no longer needed mysys/thr_mutex.c: NetWare: no need for pthread_mutex_lock calls netware/BUILD/mwenv: Add zlib to environment variables netware/Makefile.am: Add isam/isamchk.def to netware_build_files scripts/make_binary_distribution.sh: Made bin directory files more flexible for alternate platforms, without unnecessary repetition
This commit is contained in:
@ -357,14 +357,6 @@ extern int my_pthread_cond_timedwait(pthread_cond_t *cond,
|
||||
#define pthread_cond_timedwait(A,B,C) my_pthread_cond_timedwait((A),(B),(C))
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __NETWARE__
|
||||
extern int my_pthread_cond_timedwait(pthread_cond_t *cond,
|
||||
pthread_mutex_t *mutex,
|
||||
struct timespec *abstime);
|
||||
#define pthread_cond_timedwait(A,B,C) my_pthread_cond_timedwait((A),(B),(C))
|
||||
#endif /* __NETWARE__ */
|
||||
|
||||
#if defined(OS2)
|
||||
#define my_pthread_getspecific(T,A) ((T) &(A))
|
||||
#define pthread_setspecific(A,B) win_pthread_setspecific(&(A),(B),sizeof(A))
|
||||
|
Reference in New Issue
Block a user