unknown 2b9a8afa50 Merge with 4.0.21 ... BitKeeper/etc/logging_ok: auto-union Build-tools/mysql-copyright-2: Auto merged include/violite.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/buf/buf0flu.c: Auto merged innobase/buf/buf0lru.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0mem.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/fut/fut0lst.c: Auto merged innobase/ha/hash0hash.c: Auto merged innobase/include/buf0buf.ic: Auto merged innobase/include/buf0lru.h: Auto merged innobase/include/data0data.h: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/dict0mem.h: Auto merged innobase/include/fsp0fsp.h: Auto merged innobase/include/hash0hash.h: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/log0log.ic: Auto merged innobase/include/mem0dbg.ic: Auto merged innobase/include/mem0pool.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/sync0rw.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/include/trx0roll.h: Auto merged innobase/include/trx0trx.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0rw.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/thr/thr0loc.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/usr/usr0sess.c: Auto merged innobase/ut/ut0mem.c: Auto merged mysql-test/r/func_if.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_decimal.test: Auto merged mysys/mf_tempfile.c: Auto merged netware/BUILD/nwbootstrap: Auto merged netware/Makefile.am: Auto merged scripts/mysqld_safe.sh: Auto merged sql/item_cmpfunc.cc: Auto merged mysql-test/t/func_if.test: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged support-files/my-innodb-heavy-4G.cnf.sh: Auto merged Build-tools/Do-compile: Merge with 4.0 Build-tools/mysql-copyright: Merge with 4.0 client/mysqltest.c: Merge with 4.0 include/my_global.h: Merge with 4.0 innobase/buf/buf0rea.c: Merge with 4.0 innobase/data/data0type.c: Merge with 4.0 innobase/ibuf/ibuf0ibuf.c: Merge with 4.0 innobase/include/buf0buf.h: Merge with 4.0 innobase/include/data0type.h: Merge with 4.0 innobase/include/mem0mem.h: Merge with 4.0 innobase/include/mem0mem.ic: Merge with 4.0 innobase/log/log0recv.c: Merge with 4.0 libmysql/libmysql.c: Merge with 4.0 libmysqld/Makefile.am: Merge with 4.0 mysql-test/r/range.result: Merge with 4.0 mysql-test/r/type_decimal.result: Merge with 4.0 mysql-test/t/range.test: Merge with 4.0 netware/BUILD/mwenv: Merge with 4.0 netware/mysql_test_run.c: Merge with 4.0 scripts/mysql_install_db.sh: Merge with 4.0 sql/field.cc: Merge with 4.0 sql/field.h: Merge with 4.0 sql/item_cmpfunc.h: Merge with 4.0 support-files/my-huge.cnf.sh: Merge with 4.0 support-files/my-large.cnf.sh: Merge with 4.0 support-files/my-medium.cnf.sh: Merge with 4.0 support-files/my-small.cnf.sh: Merge with 4.0 support-files/mysql.spec.sh: Merge with 4.0		2004-06-18 04:38:58 +03:00
..
apply-patch	Created small scripts to manage in-tree diffs for	2003-10-15 19:50:47 -04:00
compile-AUTOTOOLS	Minor changes in netware directory (From Rob Lyon - Novell)	2003-04-24 18:15:52 -04:00
compile-linux-tools	Changed prototype of killed_ptr() to make it more portable	2004-05-26 19:12:49 +03:00
compile-netware-all	Added patches from Novell	2004-05-25 22:00:14 +03:00
compile-netware-debug	Minor changes in netware directory (From Rob Lyon - Novell)	2003-04-24 18:15:52 -04:00
compile-netware-END	Checked and applied Novell-supplied patches inside the netware directory only.	2004-01-12 21:15:49 -01:00
compile-netware-max	Changes in NetWare directory from Novell, pre-4.1.1	2003-10-02 19:08:48 -04:00
compile-netware-max-debug	Changes in NetWare directory from Novell, pre-4.1.1	2003-10-02 19:08:48 -04:00
compile-netware-src	Changes in NetWare directory from Novell, pre-4.1.1	2003-10-02 19:08:48 -04:00
compile-netware-standard	Added patches from Novell	2004-05-25 22:00:14 +03:00
compile-netware-START	Minor changes in netware directory (From Rob Lyon - Novell)	2003-04-24 18:15:52 -04:00
create-patch	Improve make_binary_distribution from Novell code at Monty's request	2003-03-27 18:13:37 -05:00
cron-build	Minor changes in netware directory (From Rob Lyon - Novell)	2003-04-24 18:15:52 -04:00
crontab	Minor changes in netware directory (From Rob Lyon - Novell)	2003-04-24 18:15:52 -04:00
knetware.imp	Changes in NetWare directory from Novell, pre-4.1.1	2003-10-02 19:08:48 -04:00
mwasmnlm	Minor changes in netware directory (From Rob Lyon - Novell)	2003-04-24 18:15:52 -04:00
mwccnlm	Minor changes in netware directory (From Rob Lyon - Novell)	2003-04-24 18:15:52 -04:00
mwenv	Merge with 4.0.21	2004-06-18 04:38:58 +03:00
mwldnlm	Minor changes in netware directory (From Rob Lyon - Novell)	2003-04-24 18:15:52 -04:00
nwbootstrap	Merge with 4.0.21	2004-06-18 04:38:58 +03:00
openssl.imp	Changes in NetWare directory from Novell, pre-4.1.1	2003-10-02 19:08:48 -04:00
save-patch	Created small scripts to manage in-tree diffs for	2003-10-15 19:50:47 -04:00