unknown 05fc3f10c9 Merge chilla.local:/home/mydev/mysql-5.0-mmerge ... into chilla.local:/home/mydev/mysql-5.1-amain configure.in: Auto merged libmysqld/lib_sql.cc: Auto merged libmysqld/libmysqld.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/gis-rtree.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/func_sapdb.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/gis.test: Auto merged mysql-test/t/key.test: Auto merged mysql-test/t/myisam.test: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_geofunc.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_sum.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql-common/client.c: Auto merged sql/sql_select.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/ndb/include/kernel/GlobalSignalNumbers.h: Auto merged storage/ndb/src/common/debugger/signaldata/SignalNames.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged support-files/mysql.spec.sh: Auto merged BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb: Manual merge include/my_sys.h: Manual merge mysql-test/t/federated.test: Manual merge sql/ha_federated.cc: Manual merge tests/Makefile.am: Manual merge		2006-07-20 21:28:55 +02:00
..
BUILD
comp_err.def
init_db.sql
install_test_db.ncf
isamchk.def
isamlog.def
libmysql.def
libmysql.imp
libmysqlmain.c
Makefile.am
my_manage.c
my_manage.h
my_print_defaults.def
myisam_ftdump.def
myisamchk.def
myisamlog.def
myisampack.def
mysql.def
mysql.xdc
mysql_fix_privilege_tables.pl
mysql_install_db.c
mysql_install_db.def
mysql_secure_installation.pl
mysql_test_run.c
mysql_test_run.def
mysql_waitpid.def
mysqladmin.def
mysqlbinlog.def
mysqlcheck.def
mysqld.def
mysqld_safe.c
mysqld_safe.def
mysqldump.def
mysqlimport.def
mysqlshow.def
mysqlslap.def
mysqltest.def
pack_isam.def
perror.def
replace.def
resolve_stack_dump.def
resolveip.def
static_init_db.sql
test_db.sql