mariadb/mysql-test/std_data
unknown 2750dc8766 Merge mysql.com:/home/jimw/my/mysql-4.1-11203
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  Resolve conflict
mysql-test/t/loaddata.test:
  Resolve conflict
2005-10-21 17:57:51 -07:00
..
des_key_file
init_file.dat symlink, not hardlink 2004-04-21 14:55:39 -05: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
loaddata3.dat Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105) 2003-12-14 06:39:52 +02:00
loaddata4.dat Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105) 2003-12-14 06:39:52 +02:00
loaddata5.dat Fix LOAD DATA to handle having the escape and enclosed-by character 2005-06-22 16:14:14 -07:00
loaddata_pair.dat Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes 2005-07-05 13:55:54 +02:00
master-bin.000001
Moscow_leap Fix for bug #6387 "Queried timestamp values do not match the inserted 2004-11-03 17:59:03 +00:00
rpl_loaddata.dat
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