diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-18 20:04:39 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-18 20:04:39 +0500 |
| commit | d3b455137ee309bd36b81a021bdaa922a9614863 (patch) | |
| tree | ffabc9ad4be9f55e1d0a61dbddd9679188670eaf /mysql-test/r/strict.result | |
| parent | f0abfddf07d55368cf758b267eec2df37fc7abb5 (diff) | |
| parent | 5f66ebe8b7ad935049ce2b2d31e48c942452895b (diff) | |
| download | mariadb-git-d3b455137ee309bd36b81a021bdaa922a9614863.tar.gz | |
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/strict.result')
0 files changed, 0 insertions, 0 deletions