unknown a821703912 Merge with 4.0 ... BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-compile-netware-standard: Delete: netware/BUILD/compile-netware-standard BitKeeper/deleted/.del-mwenv: Delete: netware/BUILD/mwenv BitKeeper/deleted/.del-nwbootstrap: Delete: netware/BUILD/nwbootstrap BitKeeper/deleted/.del-compile-AUTOTOOLS: Delete: netware/BUILD/compile-AUTOTOOLS BitKeeper/deleted/.del-compile-linux-tools: Delete: netware/BUILD/compile-linux-tools BitKeeper/deleted/.del-compile-netware-END: Delete: netware/BUILD/compile-netware-END BitKeeper/deleted/.del-compile-netware-START: Delete: netware/BUILD/compile-netware-START BitKeeper/deleted/.del-compile-netware-all: Delete: netware/BUILD/compile-netware-all BitKeeper/deleted/.del-compile-netware-debug: Delete: netware/BUILD/compile-netware-debug BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5: Auto merged BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa: Auto merged BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f: Auto merged BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980: Auto merged BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee: Auto merged Docs/internals.texi: Auto merged VC++Files/bdb/bdb.dsp: Auto merged VC++Files/bdb/build_win32/Berkeley_DB.dsw: Auto merged VC++Files/bdb/build_win32/db_archive.dsp: Auto merged VC++Files/bdb/build_win32/db_buildall.dsp: Auto merged VC++Files/bdb/build_win32/db_checkpoint.dsp: Auto merged VC++Files/bdb/build_win32/db_deadlock.dsp: Auto merged VC++Files/bdb/build_win32/db_dll.dsp: Auto merged VC++Files/bdb/build_win32/db_dump.dsp: Auto merged VC++Files/bdb/build_win32/db_java.dsp: Auto merged VC++Files/bdb/build_win32/db_load.dsp: Auto merged VC++Files/bdb/build_win32/db_printlog.dsp: Auto merged VC++Files/bdb/build_win32/db_recover.dsp: Auto merged VC++Files/bdb/build_win32/db_stat.dsp: Auto merged VC++Files/bdb/build_win32/db_static.dsp: Auto merged VC++Files/bdb/build_win32/db_static1.dsp: Auto merged VC++Files/bdb/build_win32/db_tcl.dsp: Auto merged VC++Files/bdb/build_win32/db_test.dsp: Auto merged VC++Files/bdb/build_win32/db_upgrade.dsp: Auto merged VC++Files/bdb/build_win32/db_verify.dsp: Auto merged VC++Files/bdb/build_win32/ex_access.dsp: Auto merged VC++Files/bdb/build_win32/ex_btrec.dsp: Auto merged VC++Files/bdb/build_win32/ex_env.dsp: Auto merged VC++Files/bdb/build_win32/ex_lock.dsp: Auto merged VC++Files/bdb/build_win32/ex_mpool.dsp: Auto merged VC++Files/bdb/build_win32/ex_tpcb.dsp: Auto merged VC++Files/bdb/build_win32/excxx_access.dsp: Auto merged VC++Files/bdb/build_win32/excxx_btrec.dsp: Auto merged VC++Files/bdb/build_win32/excxx_env.dsp: Auto merged VC++Files/bdb/build_win32/excxx_lock.dsp: Auto merged VC++Files/bdb/build_win32/excxx_mpool.dsp: Auto merged VC++Files/bdb/build_win32/excxx_tpcb.dsp: Auto merged VC++Files/client/mysql.dsp: Auto merged VC++Files/client/mysqladmin.dsp: Auto merged VC++Files/client/mysqlcheck.dsp: Auto merged VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/client/mysqlclient.dsw: Auto merged VC++Files/client/mysqldump.dsp: Auto merged VC++Files/client/mysqlimport.dsp: Auto merged VC++Files/client/mysqlshow.dsp: Auto merged VC++Files/comp_err/comp_err.dsp: Auto merged VC++Files/contrib/asm386/zlibvc.dsp: Auto merged VC++Files/contrib/asm386/zlibvc.dsw: Auto merged VC++Files/contrib/minizip/zlibvc.dsp: Auto merged VC++Files/contrib/minizip/zlibvc.dsw: Auto merged VC++Files/dbug/dbug.dsp: Auto merged VC++Files/dbug/dbug.dsw: Auto merged VC++Files/heap/heap.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged VC++Files/isam/isam.dsp: Auto merged VC++Files/isam/isam.dsw: Auto merged VC++Files/isamchk/isamchk.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/libmysql/libmysql.dsw: Auto merged VC++Files/libmysqld/examples/test_libmysqld.dsp: Auto merged VC++Files/libmysqld/libmysqld.dsp: Auto merged VC++Files/libmysqltest/myTest.dsp: Auto merged VC++Files/libmysqltest/mytest.dsw: Auto merged VC++Files/merge/merge.dsp: Auto merged VC++Files/merge/merge.dsw: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisam/myisam.dsp: Auto merged VC++Files/myisamchk/myisamchk.dsp: Auto merged VC++Files/myisamlog/myisamlog.dsp: Auto merged VC++Files/myisammrg/myisammrg.dsp: Auto merged VC++Files/mysql.dsp: Auto merged VC++Files/mysql.dsw: Auto merged VC++Files/myisampack/myisampack.dsp: Auto merged VC++Files/mysqlbinlog/mysqlbinlog.dsp: Auto merged VC++Files/mysqlcheck/mysqlcheck.dsp: Auto merged VC++Files/mysqldemb/mysqldemb.dsp: Auto merged VC++Files/mysqlmanager/MySqlManager.dsp: Auto merged VC++Files/mysqlmanager/mysqlmanager.dsw: Auto merged VC++Files/mysqlserver/mysqlserver.dsp: Auto merged VC++Files/mysqlshutdown/myshutdown.dsp: Auto merged VC++Files/mysqlshutdown/mysqlshutdown.dsp: Auto merged VC++Files/mysqlwatch/mysqlwatch.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/mysys/mysys.dsw: Auto merged VC++Files/pack_isam/pack_isam.dsp: Auto merged VC++Files/perror/perror.dsp: Auto merged VC++Files/regex/regex.dsp: Auto merged VC++Files/regex/regex.dsw: Auto merged VC++Files/replace/replace.dsp: Auto merged VC++Files/sql/mysqld.dsw: Auto merged VC++Files/sql/mysqldmax.dsp: Auto merged VC++Files/sql/old/mysqld.dsw: Auto merged VC++Files/strings/MASM6x/strings.dsp: Auto merged VC++Files/strings/MASM6x/strings.dsw: Auto merged VC++Files/strings/backup/strings.dsp: Auto merged VC++Files/strings/backup/strings.dsw: Auto merged VC++Files/strings/noMASM/strings.dsp: Auto merged VC++Files/strings/noMASM/strings.dsw: Auto merged VC++Files/strings/strings.dsw: Auto merged VC++Files/test1/test1.dsp: Auto merged VC++Files/thr_insert_test/thr_insert_test.dsp: Auto merged VC++Files/thr_test/thr_test.dsp: Auto merged VC++Files/vio/vio.dsp: Auto merged VC++Files/zlib/zlib.dsp: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlshow.c: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/myisam.h: Auto merged include/thr_lock.h: Auto merged include/violite.h: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/trx/trx0sys.c: Auto merged libmysqld/lib_vio.c: Auto merged myisam/mi_create.c: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/r/rpl000001.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/auto_increment.test: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/func_like.test: Auto merged mysql-test/t/group_by.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/join.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/type_timestamp.test: Auto merged mysys/default.c: Auto merged mysys/thr_lock.c: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/filesort.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.h: Auto merged sql/mf_iocache.cc: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/repl_failsafe.h: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_base.cc: Auto merged sql-bench/crash-me.sh: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/sql_class.h: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_update.cc: Auto merged sql/stacktrace.c: Auto merged sql/table.cc: Auto merged sql/unireg.h: Auto merged strings/ctype-tis620.c: Auto merged strings/t_ctype.h: Auto merged support-files/mysql.spec.sh: Auto merged tests/grant.res: Auto merged vio/viosocket.c: Auto merged		2003-03-16 19:17:54 +02:00
..
btr0btr.h	btr0cur.h, btr0btr.h, btr0btr.c, btr0cur.c, row0purge.c:	2003-01-13 15:52:39 +02:00
btr0btr.ic
btr0cur.h	btr0cur.h, btr0btr.h, btr0btr.c, btr0cur.c, row0purge.c:	2003-01-13 15:52:39 +02:00
btr0cur.ic
btr0pcur.h
btr0pcur.ic
btr0sea.h	btr0sea.h, btr0sea.c:	2003-01-18 15:01:56 +02:00
btr0sea.ic
btr0types.h
buf0buf.h	srv0srv.c, mem0pool.c, mem0pool.h, buf0buf.h, buf0buf.c:	2003-01-09 00:10:36 +02:00
buf0buf.ic
buf0flu.h
buf0flu.ic
buf0lru.h
buf0lru.ic
buf0rea.h
buf0types.h
com0com.h
com0com.ic
com0shm.h
com0shm.ic
data0data.h
data0data.ic
data0type.h
data0type.ic
data0types.h
db0err.h
dict0boot.h
dict0boot.ic
dict0crea.h
dict0crea.ic
dict0dict.h
dict0dict.ic
dict0load.h
dict0load.ic
dict0mem.h
dict0mem.ic
dict0types.h
dyn0dyn.h
dyn0dyn.ic
eval0eval.h
eval0eval.ic
eval0proc.h
eval0proc.ic
fil0fil.h
fsp0fsp.h
fsp0fsp.ic
fut0fut.h
fut0fut.ic
fut0lst.h
fut0lst.ic
ha0ha.h
ha0ha.ic
hash0hash.h
hash0hash.ic
ib_odbc.h
ibuf0ibuf.h
ibuf0ibuf.ic
ibuf0types.h
lock0lock.h
lock0lock.ic
lock0types.h
log0log.h
log0log.ic
log0recv.h
log0recv.ic
mach0data.h
mach0data.ic
Makefile.am
Makefile.i
makefilewin.i
mem0dbg.h
mem0dbg.ic
mem0mem.h
mem0mem.ic
mem0pool.h	srv0srv.c, mem0pool.c, mem0pool.h, buf0buf.h, buf0buf.c:	2003-01-09 00:10:36 +02:00
mem0pool.ic
mtr0log.h
mtr0log.ic
mtr0mtr.h
mtr0mtr.ic
mtr0types.h
odbc0odbc.h
os0file.h
os0proc.h	config-win.h, os0proc.h, os0proc.c, srv0start.c:	2003-01-30 18:52:45 +02:00
os0proc.ic
os0shm.h
os0shm.ic
os0sync.h
os0sync.ic
os0thread.h	Fixes for Netware	2003-01-28 08:38:28 +02:00
os0thread.ic
page0cur.h
page0cur.ic
page0page.h
page0page.ic
page0types.h
pars0grm.h
pars0opt.h
pars0opt.ic
pars0pars.h
pars0pars.ic
pars0sym.h
pars0sym.ic
pars0types.h
que0que.h
que0que.ic
que0types.h
read0read.h
read0read.ic
read0types.h
rem0cmp.h
rem0cmp.ic
rem0rec.h
rem0rec.ic
rem0types.h
row0ins.h
row0ins.ic
row0mysql.h	ut0mem.c, row0sel.c, row0mysql.c, ut0mem.h, row0sel.h, row0mysql.h:	2003-01-12 23:58:56 +02:00
row0mysql.ic
row0purge.h
row0purge.ic
row0row.h
row0row.ic
row0sel.h	ut0mem.c, row0sel.c, row0mysql.c, ut0mem.h, row0sel.h, row0mysql.h:	2003-01-12 23:58:56 +02:00
row0sel.ic
row0types.h
row0uins.h
row0uins.ic
row0umod.h
row0umod.ic
row0undo.h
row0undo.ic
row0upd.h
row0upd.ic
row0vers.h
row0vers.ic
srv0que.h
srv0srv.h
srv0srv.ic
srv0start.h	trx0sys.c, trx0roll.c, srv0start.h:	2003-03-02 22:34:09 +02:00
sync0arr.h
sync0arr.ic
sync0ipm.h
sync0ipm.ic
sync0rw.h
sync0rw.ic
sync0sync.h
sync0sync.ic
sync0types.h
thr0loc.h
thr0loc.ic
trx0purge.h
trx0purge.ic
trx0rec.h
trx0rec.ic
trx0roll.h
trx0roll.ic
trx0rseg.h
trx0rseg.ic
trx0sys.h
trx0sys.ic
trx0trx.h
trx0trx.ic
trx0types.h
trx0undo.h
trx0undo.ic
univ.i
univold.i
univoldmysql.i
usr0sess.h
usr0sess.ic
usr0types.h
ut0byte.h
ut0byte.ic
ut0dbg.h
ut0lst.h
ut0mem.h	ut0mem.c, row0sel.c, row0mysql.c, ut0mem.h, row0sel.h, row0mysql.h:	2003-01-12 23:58:56 +02:00
ut0mem.ic
ut0rnd.h
ut0rnd.ic
ut0sort.h
ut0ut.h
ut0ut.ic