summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/union.result2
-rw-r--r--mysql-test/t/union.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index a39a4e8a85f..fbd4624a57c 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -435,7 +435,7 @@ drop temporary table t1;
create table t1 select a from t1 union select a from t2;
ERROR HY000: You can't specify target table 't1' for update in FROM clause
select a from t1 union select a from t2 order by t2.a;
-ERROR 42S22: Unknown column 't2.a' in 'ORDER BY'
+ERROR 42S02: Unknown table 't2' in order clause
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 eaa1415d41f..9866b867427 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -251,7 +251,7 @@ create temporary table t1 select a from t1 union select a from t2;
drop temporary table t1;
--error 1093
create table t1 select a from t1 union select a from t2;
---error 1054
+--error 1109
select a from t1 union select a from t2 order by t2.a;
drop table t1,t2;