unknown 037b0a7b14 Merge with 4.0 ... BitKeeper/etc/logging_ok: auto-union mysql-test/r/outfile2.result: Merge rename: mysql-test/r/outfile.result -> mysql-test/r/outfile2.result myisam/mi_key.c: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/auto_increment.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/t/auto_increment.test: Auto merged mysql-test/t/innodb.test: Auto merged sql/handler.h: Auto merged mysql-test/t/alter_table.test: Merge mysql-test/t/outfile.test: Merge sql/item_func.cc: Merge sql/share/czech/errmsg.txt: Merge sql/share/danish/errmsg.txt: Merge sql/share/dutch/errmsg.txt: Merge sql/share/english/errmsg.txt: Merge sql/share/estonian/errmsg.txt: Merge sql/share/french/errmsg.txt: Merge sql/share/german/errmsg.txt: Merge sql/share/greek/errmsg.txt: Merge sql/share/hungarian/errmsg.txt: Merge sql/share/italian/errmsg.txt: Merge sql/share/japanese/errmsg.txt: Merge sql/share/korean/errmsg.txt: Merge sql/share/norwegian-ny/errmsg.txt: Merge sql/share/norwegian/errmsg.txt: Merge sql/share/polish/errmsg.txt: Merge sql/share/portuguese/errmsg.txt: Merge sql/share/romanian/errmsg.txt: Merge sql/share/russian/errmsg.txt: Merge sql/share/slovak/errmsg.txt: Merge sql/share/spanish/errmsg.txt: Merge sql/share/swedish/errmsg.txt: Merge sql/share/ukrainian/errmsg.txt: Merge sql/sql_table.cc: Merge sql/sql_yacc.yy: Keep old sql/unireg.cc: Merge		2005-05-14 00:01:40 +03:00
..
check_var_limit.inc
ctype_common.inc
ctype_filesort.inc
endspace.inc
have_archive.inc
have_bdb.inc
have_big5.inc
have_blackhole.inc
have_compress.inc
have_cp932.inc
have_cp1250_ch.inc
have_crypt.inc
have_csv.inc
have_debug.inc
have_exampledb.inc
have_geometry.inc
have_innodb.inc
have_isam.inc
have_multi_ndb.inc
have_ndb.inc
have_openssl.inc
have_openssl_1.inc
have_outfile.inc
have_query_cache.inc
have_sjis.inc
have_tis620.inc
have_ucs2.inc
have_ujis.inc
master-slave.inc
not_embedded.inc
ps_conv.inc
ps_create.inc
ps_modify.inc
ps_modify1.inc
ps_query.inc
ps_renew.inc
system_db_struct.inc
test_outfile.inc