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 | d202216d78859e4dd385e8c36caf426ae1ad8a52 (patch) | |
| tree | 9f49733e328a5be3338fddb8a75cab6800d84591 /mysql-test/r/distinct.result | |
| parent | 89723d3d19fd9898387eead5138d7ca8cac04d2c (diff) | |
| parent | 2501c71acb45216b3131ae732cb67de140d9a069 (diff) | |
| download | mariadb-git-d202216d78859e4dd385e8c36caf426ae1ad8a52.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/r/distinct.result')
0 files changed, 0 insertions, 0 deletions