BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/ctype_tis620.result-old:
Merge rename: mysql-test/r/ctype_tis620.result -> mysql-test/r/ctype_tis620.result-old
BUILD/compile-pentium-max:
Auto merged
BitKeeper/etc/config:
Auto merged
Build-tools/Bootstrap:
Auto merged
Build-tools/Do-compile:
Auto merged
configure.in:
Auto merged
mysql-test/t/ctype_tis620.test-old:
Merge rename: mysql-test/t/ctype_tis620.test -> mysql-test/t/ctype_tis620.test-old
Docs/Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/ibuf/ibuf0ibuf.c:
Auto merged
innobase/include/dict0dict.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/ut0mem.h:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_dynrec.c:
Auto merged
myisam/mi_key.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
netware/BUILD/compile-linux-tools:
Need to run make on sql_yacc.cc.
netware/BUILD/compile-netware-END:
Use .zip package.
netware/BUILD/compile-netware-all:
Add compile-netware-src.
netware/BUILD/compile-netware-standard:
Need backslash to avoid error.
netware/BUILD/mwenv:
Add additional include, library paths, -dialect and -map flags for CW.
netware/BUILD/nwbootstrap:
Additional status messages, update versions in .def files.
netware/Makefile.am:
Cosmetic change, add @openssl_libs@ in case of OpenSSL feature usage.
netware/isamchk.def:
Add SCREENNAME to allow interaction.
netware/my_manage.c:
Take out unused args to mysqladmin.
netware/myisamchk.def:
Add SCREENNAME to allow interaction.
netware/myisamlog.def:
Add SCREENNAME to allow interaction.
netware/myisampack.def:
Add SCREENNAME to allow interaction.
netware/mysql_test_run.c:
Multiple changes to help test suite.
netware/mysqlbinlog.def:
Add SCREENNAME to allow interaction.
netware/mysqlcheck.def:
Add SCREENNAME to allow interaction.
netware/mysqld_safe.c:
Make error message more accurate/descriptive.
netware/mysqldump.def:
Add SCREENNAME to allow interaction.
netware/mysqlimport.def:
Add SCREENNAME to allow interaction.
client/mysql.cc:
NetWare only: Remove pthread_yield on large screen results
client/mysqldump.c:
NetWare only: Remove pthread_yield on large screen results
include/my_pthread.h:
NetWare only: pthread_cond_timedwait now present in LibC
mysys/default.c:
Add conditional for NetWare
mysys/my_init.c:
Changes to netware_init
mysys/my_pthread.c:
NetWare only: special my_pthread_cond_timedwait no longer needed
mysys/thr_mutex.c:
NetWare: no need for pthread_mutex_lock calls
netware/BUILD/mwenv:
Add zlib to environment variables
netware/Makefile.am:
Add isam/isamchk.def to netware_build_files
scripts/make_binary_distribution.sh:
Made bin directory files more flexible for alternate platforms, without unnecessary repetition
Change mode to -rwxrwxr-x
netware/BUILD/compile-AUTOTOOLS:
Change mode to -rwxrwxr-x
netware/BUILD/compile-linux-tools:
Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-END:
Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-START:
Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-all:
Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-debug:
Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-standard:
Change mode to -rwxrwxr-x
netware/BUILD/mwasmnlm:
Change mode to -rwxrwxr-x
netware/BUILD/mwccnlm:
Change mode to -rwxrwxr-x
netware/BUILD/mwenv:
Change mode to -rwxrwxr-x
netware/BUILD/mwldnlm:
Change mode to -rwxrwxr-x
netware/BUILD/nwbootstrap:
Change mode to -rwxrwxr-x
