mirror of
https://github.com/MariaDB/server.git
synced 2026-05-02 13:15:32 +02: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:
parent
9dc2425066
commit
9c3d7df569
10 changed files with 41 additions and 96 deletions
|
|
@ -6,9 +6,9 @@
|
|||
# the default is "F:/mydev"
|
||||
export MYDEV="WINE_BUILD_DIR"
|
||||
|
||||
export MWCNWx86Includes="$MYDEV/libc/include"
|
||||
export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib"
|
||||
export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib"
|
||||
export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/zlib-1.1.4"
|
||||
export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/zlib-1.1.4"
|
||||
export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a"
|
||||
|
||||
export WINEPATH="$MYDEV/mw/bin"
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ netware_build_files = client/mysql.def client/mysqladmin.def \
|
|||
extra/mysql_install.def extra/my_print_defaults.def \
|
||||
extra/perror.def extra/replace.def \
|
||||
extra/resolveip.def extra/comp_err.def \
|
||||
isam/isamchk.def \
|
||||
isam/isamchk.def \
|
||||
isam/isamlog.def isam/pack_isam.def \
|
||||
libmysqld/libmysqld.def myisam/myisamchk.def \
|
||||
myisam/myisamlog.def myisam/myisampack.def \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue