diff options
author | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-09 11:46:58 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-09 11:46:58 +0500 |
commit | 37feda2596128fec33ac0e4fe8ff0cd35efd1dec (patch) | |
tree | 9f49733e328a5be3338fddb8a75cab6800d84591 /mysql-test/t/date_formats.test | |
parent | 7f993fa6789d92b7927e76ba00d356a6409e4ce0 (diff) | |
parent | d2667d1a6ebe7feeb8b80fcc5cfefac80ed729b0 (diff) | |
download | mariadb-git-37feda2596128fec33ac0e4fe8ff0cd35efd1dec.tar.gz |
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
mysql-test/t/loaddata.test:
Auto merged
sql/sql_load.cc:
Auto merged
mysql-test/r/loaddata.result:
SCCS merged
Diffstat (limited to 'mysql-test/t/date_formats.test')
0 files changed, 0 insertions, 0 deletions