diff options
| author | unknown <greg@mysql.com> | 2003-02-26 13:43:54 -0500 |
|---|---|---|
| committer | unknown <greg@mysql.com> | 2003-02-26 13:43:54 -0500 |
| commit | 2eab6ae62fd7111b9c66576ff5df27837925f86d (patch) | |
| tree | f95feced89c3d95b7e17e4266e63c2ea378839cd /netware | |
| parent | 9b7ebb928ca407c5a6ec19d89f7b95f43b601222 (diff) | |
| download | mariadb-git-2eab6ae62fd7111b9c66576ff5df27837925f86d.tar.gz | |
Minor changes from 4.0->4.1 by Novell (Rob Lyon)
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)
Diffstat (limited to 'netware')
| -rw-r--r-- | netware/mw/mwenv | 11 | ||||
| -rw-r--r-- | netware/nwconfigure | 2 |
2 files changed, 6 insertions, 7 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 |