unknown 1ead85e678 Fixes after merge ... mysql-test/std_data/trunc_binlog.000001: Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001 client/mysqltest.c: Fixed merge problem mysql-test/mysql-test-run.sh: Fixed merge problem mysql-test/r/distinct.result: Fix after merge mysql-test/r/drop_temp_table.result: Fix after merge mysql-test/r/join_outer.result: Fix after merge mysql-test/r/mysqldump.result: Fix after merge mysql-test/r/null_key.result: Fix after merge mysql-test/r/order_by.result: Fix after merge mysql-test/r/rpl_alter.result: Fix after merge mysql-test/r/rpl_loaddata.result: Fix after merge mysql-test/r/rpl_loaddata_rule_m.result: Fix after merge mysql-test/r/rpl_trunc_binlog.result: Fix after merge mysql-test/r/select_safe.result: Fix after merge mysql-test/t/insert.test: Fix after merge mysql-test/t/mysqlbinlog.test: Fix after merge mysql-test/t/rpl000009.test: Fix after merge mysql-test/t/rpl_alter.test: Fix after merge mysql-test/t/rpl_loaddata_rule_m.test: Fix after merge mysql-test/t/rpl_trunc_binlog.test: Fix after merge sql-common/client.c: Fix after merge sql/item_subselect.cc: Fix after merge sql/repl_failsafe.cc: Fix after merge sql/slave.cc: Fix after merge sql/sql_insert.cc: Fix after merge		2003-10-08 12:01:58 +03:00
..
des_key_file	Added FLUSH DES_KEY_FILE.	2001-12-13 15:53:18 +02:00
loaddata1.dat	Fixed that reading a DATE string of 000000 is interpreted as 0000-00-00 instead of 2000-00-00	2003-05-05 14:52:39 +03:00
loaddata2.dat	Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files.	2003-08-22 04:07:40 +03:00
master-bin.000001	Changed binlog name padding from binlog.001 to binlog.000001	2002-10-29 15:11:13 -07:00
rpl_loaddata.dat	Guard against compiling without -fno-exceptions	2003-01-14 11:27:26 +02:00
rpl_loaddata2.dat	Fix for BUG#1391:	2003-09-25 00:14:46 +02:00
trunc_binlog.000001	Fixes after merge	2003-10-08 12:01:58 +03:00
warnings_loaddata.dat	update the test for LOAD DATA INFILE warnings	2003-04-22 00:54:33 -07:00
words.dat	Fixed multi-table-delete for InnoDB tables	2003-02-17 02:14:37 +02:00