diff options
| -rw-r--r-- | netware/mw/mwenv | 11 | ||||
| -rw-r--r-- | netware/nwconfigure | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/netware/mw/mwenv b/netware/mw/mwenv index b82dbdc0c7f..31500ae400f 100644 --- a/netware/mw/mwenv +++ b/netware/mw/mwenv @@ -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" diff --git a/netware/nwconfigure b/netware/nwconfigure index aeb68ada5b8..3d89377dea8 100644 --- a/netware/nwconfigure +++ b/netware/nwconfigure @@ -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 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 982bf897c43..d2ce0768cfb 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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; } |