Commit de427e52 authored by greg@mysql.com's avatar greg@mysql.com

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

parent 2870719c
#! /bin/sh #! /bin/sh
export MYDEV="F:/mysql" export MYDEV="F:/mydev"
export MWCNWx86Includes="$MYDEV/libc/include" export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/zlib-1.1.4"
export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib" 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" export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a"
export WINEPATH="$MYDEV/mw/bin" 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"
...@@ -14,7 +14,7 @@ CMD="\ ...@@ -14,7 +14,7 @@ CMD="\
./configure --host=i686-pc-netware $* \ ./configure --host=i686-pc-netware $* \
--without-docs \ --without-docs \
--enable-local-infile \ --enable-local-infile \
--with-extra-charsets=all \ --with-extra-charsets=latin1_de \
--prefix=N:/mysql \ --prefix=N:/mysql \
" "
#rm -f config.cache config.log config.status #rm -f config.cache config.log config.status
......
...@@ -823,7 +823,6 @@ static void __cdecl kill_server(int sig_ptr) ...@@ -823,7 +823,6 @@ static void __cdecl kill_server(int sig_ptr)
pthread_exit(0); /* purecov: deadcode */ pthread_exit(0); /* purecov: deadcode */
#endif /* __NETWARE__ */ #endif /* __NETWARE__ */
pthread_exit(0); /* purecov: deadcode */
#endif /* EMBEDDED_LIBRARY */ #endif /* EMBEDDED_LIBRARY */
RETURN_FROM_KILL_SERVER; RETURN_FROM_KILL_SERVER;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment