summaryrefslogtreecommitdiff
path: root/mysql-test/r/select.result
diff options
context:
space:
mode:
authorkent@mysql.com <>2005-05-14 23:48:15 +0200
committerkent@mysql.com <>2005-05-14 23:48:15 +0200
commita628878bbfa1e4db5171bc8cf63416f66dca9ede (patch)
treecba4e6ab6d4d475afed624aa5f810b93a0a6fccf /mysql-test/r/select.result
parent3eebfde64480a66b3c8503f337102b9e63f3722a (diff)
parent6588997eb8218233b664fbbb32b130e832387daa (diff)
downloadmariadb-git-a628878bbfa1e4db5171bc8cf63416f66dca9ede.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
Diffstat (limited to 'mysql-test/r/select.result')
-rw-r--r--mysql-test/r/select.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 50300ed9b76..387e7eff693 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -2451,7 +2451,7 @@ a
select distinct distinct * from t1;
a
select all distinct * from t1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinct * from t1' at line 1
+ERROR HY000: Incorrect usage of ALL and DISTINCT
select distinct all * from t1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'all * from t1' at line 1
+ERROR HY000: Incorrect usage of ALL and DISTINCT
drop table t1;