diff options
| author | unknown <monty@mysql.com> | 2004-05-25 22:54:00 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-25 22:54:00 +0300 |
| commit | a9b481d3cd7fbf832b17523c521185db6366492c (patch) | |
| tree | b258dbd41e0b45f70adf8c42ee94cce74cd0232f /netware/BUILD | |
| parent | de5edbf8db66e1f896b76d408152cd0094dcf684 (diff) | |
| parent | a3d0ce6bc611673e2d5342bc9cd735a9febfe6b4 (diff) | |
| download | mariadb-git-a9b481d3cd7fbf832b17523c521185db6366492c.tar.gz | |
merge with 4.0 to get Netware patches and fixes for libmysqld.dll
configure.in:
Auto merged
Build-tools/Do-compile:
Auto merged
client/mysql.cc:
Auto merged
client/mysqladmin.c:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/thr_alarm.h:
Auto merged
innobase/include/trx0roll.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0roll.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/usr/usr0sess.c:
Auto merged
isam/isamchk.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysys/default.c:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_pthread.c:
Auto merged
netware/Makefile.am:
Auto merged
netware/init_db.sql:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
tools/mysqlmanager.c:
Auto merged
VC++Files/dbug/dbug.dsp:
Auto merged
VC++Files/heap/heap.dsp:
Auto merged
VC++Files/isam/isam.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/myisam/myisam.dsp:
Auto merged
VC++Files/myisammrg/myisammrg.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
merge
client/mysqlbinlog.cc:
merge
extra/perror.c:
merge
include/mysql_com.h:
merge
libmysqld/Makefile.am:
merge
netware/BUILD/mwenv:
merge
sql/mysqld.cc:
merge
Diffstat (limited to 'netware/BUILD')
| -rwxr-xr-x | netware/BUILD/compile-netware-all | 4 | ||||
| -rwxr-xr-x | netware/BUILD/compile-netware-standard | 1 | ||||
| -rwxr-xr-x | netware/BUILD/mwenv | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/netware/BUILD/compile-netware-all b/netware/BUILD/compile-netware-all index 6baff699e94..dbe64e8f97e 100755 --- a/netware/BUILD/compile-netware-all +++ b/netware/BUILD/compile-netware-all @@ -11,5 +11,5 @@ path=`dirname $0` $path/compile-netware-src $path/compile-netware-standard $path/compile-netware-debug -#$path/compile-netware-max -#$path/compile-netware-max-debug +$path/compile-netware-max +$path/compile-netware-max-debug diff --git a/netware/BUILD/compile-netware-standard b/netware/BUILD/compile-netware-standard index 45f5021862c..a21ea16a445 100755 --- a/netware/BUILD/compile-netware-standard +++ b/netware/BUILD/compile-netware-standard @@ -14,6 +14,7 @@ suffix="standard" extra_configs=" \ --with-innodb \ + --enable-thread-safe-client \ " . $path/compile-netware-END diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv index e4e6d509100..6f818b6f7a3 100755 --- a/netware/BUILD/mwenv +++ b/netware/BUILD/mwenv @@ -6,9 +6,9 @@ # the default is "F:/mydev" export MYDEV="WINE_BUILD_DIR" -export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV;$MYDEV/zlib-1.1.4"" -export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/zlib-1.1.4;$MYDEV/mysql-VERSION/netware/BUILD" -export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;knetware.imp" +export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV;$MYDEV/zlib-1.1.4" +export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.1.4;$MYDEV/mysql-VERSION/netware/BUILD" +export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;neb.imp;zPublics.imp;knetware.imp" export WINEPATH="$MYDEV/mw/bin" |