summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <antony@ltantony.mysql.com>2005-05-09 14:31:46 +0100
committerunknown <antony@ltantony.mysql.com>2005-05-09 14:31:46 +0100
commit19b8643830e557218143b2bd95abe9915ef07571 (patch)
treee77d7ae277d388e55273e3ede410ca145b9b3b72 /mysql-test
parent9a8e31a426e2f937bfcd744d9b9b02d464383549 (diff)
downloadmariadb-git-19b8643830e557218143b2bd95abe9915ef07571.tar.gz
Bug#8733 - server accepts malformed query (multiply mentioned distinct)
Detect conflicting options in SELECT mysql-test/r/select.result: Test for bug#8733 mysql-test/t/select.test: Test for bug#8733 sql/mysql_priv.h: New bit for ALL sql/sql_yacc.yy: We want to complain if DISTINCT or ALL is used in SELECT when a conflicting option is already selected.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/select.result10
-rw-r--r--mysql-test/t/select.test16
2 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 9df5efc66d6..50300ed9b76 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -2445,3 +2445,13 @@ cast((a - b) as unsigned)
1
18446744073709551615
drop table t1;
+create table t1 (a int(11));
+select all all * from t1;
+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
+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
+drop table t1;
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index f58a78205ec..6d6d5f6b6e1 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -1979,3 +1979,19 @@ select a-b , (a-b < 0) from t1 order by 1;
select a-b as d, (a-b >= 0), b from t1 group by b having d >= 0;
select cast((a - b) as unsigned) from t1 order by 1;
drop table t1;
+
+
+#
+# Bug#8733 server accepts malformed query (multiply mentioned distinct)
+#
+create table t1 (a int(11));
+select all all * from t1;
+select distinct distinct * from t1;
+--error 1064
+select all distinct * from t1;
+--error 1064
+select distinct all * from t1;
+drop table t1;
+
+
+#