diff options
author | unknown <timour/timka@lamia.home> | 2006-08-29 16:39:09 +0300 |
---|---|---|
committer | unknown <timour/timka@lamia.home> | 2006-08-29 16:39:09 +0300 |
commit | 2592d4a1399bc1d5a05c8184c19fcddfa661e141 (patch) | |
tree | 7fdd514b21c469056458913aa4a76cfcb7ca6d46 /mysql-test/t/ps.test | |
parent | e454fb0c9dd768ff7198d177253d9e6fe95511b2 (diff) | |
parent | e3181c59e7962657bf6a273db68e0649d5372bba (diff) | |
download | mariadb-git-2592d4a1399bc1d5a05c8184c19fcddfa661e141.tar.gz |
Merge lamia.home:/home/timka/mysql/src/5.0-bug-21456
into lamia.home:/home/timka/mysql/src/5.1-bug-21456
mysql-test/r/distinct.result:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/ps.test')
0 files changed, 0 insertions, 0 deletions