summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2004-03-22 16:35:15 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2004-03-22 16:35:15 +0200
commitbb9584fdab49a584e43407f0165b022d65297971 (patch)
tree309edb65362798ab2f4b68d7a2bdcfd27c4aca54 /mysql-test
parent1f115bc26595488a08216973c65f0f7714bd0623 (diff)
downloadmariadb-git-bb9584fdab49a584e43407f0165b022d65297971.tar.gz
union.result:
A test case for the bug that allowed table names to be used in ORDER BY columns (But #3064) union.test: A test case for the bug that allowed table names to be used in ORDER BY columns (But #3064) sql_union.cc: A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064) sql/sql_union.cc: A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064) mysql-test/t/union.test: A test case for the bug that allowed table names to be used in ORDER BY columns (But #3064) mysql-test/r/union.result: A test case for the bug that allowed table names to be used in ORDER BY columns (But #3064)
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/union.result2
-rw-r--r--mysql-test/t/union.test2
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index fc5aa1ad0cb..4b9555c334b 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -422,6 +422,8 @@ Wrong usage/placement of 'SQL_CALC_FOUND_ROWS'
create temporary table t1 select a from t1 union select a from t2;
create table t1 select a from t1 union select a from t2;
INSERT TABLE 't1' isn't allowed in FROM table list
+select a from t1 union select a from t2 order by t2.a;
+Unknown column 't2.a' in 'ORDER BY'
drop table t1,t2;
select length(version()) > 1 as `*` UNION select 2;
*
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index badfe4b9a3a..c978aef9ce0 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -226,6 +226,8 @@ SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a desc LIMIT 1;
create temporary table t1 select a from t1 union select a from t2;
--error 1093
create table t1 select a from t1 union select a from t2;
+--error 1054
+select a from t1 union select a from t2 order by t2.a;
drop table t1,t2;
#