1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor changes from 4.0->4.1 by Novell (Rob Lyon)

Browse Source 
netware/mw/mwenv:
  MW environment for 4.1 (add zlib dir, change path)
netware/nwconfigure:
  with-extra-charsets changed to latin1_de
sql/mysqld.cc:
  Removed duplicate call to pthread_exit(0)
This commit is contained in:
unknown 2003-02-26 13:43:54 -05:00
parent 9b7ebb928c
commit 2eab6ae62f
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
netware/mw/mwenv
View File

@ -1,12 +1,11 @@
#! /bin/sh
export MYDEV="F:/mysql"
export MYDEV="F:/mydev"
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"
export PATH="$PATH:$HOME/mysql/mysql-4.0/netware/mw"
export PATH="$PATH:$HOME/mydev/mysql-4.1/netware/mw"

2
netware/nwconfigure
View File

@ -14,7 +14,7 @@ CMD="\
./configure --host=i686-pc-netware $* \
--without-docs \
--enable-local-infile \
--with-extra-charsets=all \
--with-extra-charsets=latin1_de \
--prefix=N:/mysql \
"
#rm -f config.cache config.log config.status

1
sql/mysqld.cc
View File

@ -823,7 +823,6 @@ static void __cdecl kill_server(int sig_ptr)
pthread_exit(0); /* purecov: deadcode */
#endif /* __NETWARE__ */
pthread_exit(0); /* purecov: deadcode */
#endif /* EMBEDDED_LIBRARY */
RETURN_FROM_KILL_SERVER;
}