summaryrefslogtreecommitdiff
path: root/mysql-test/r/union.result
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-01-14 18:00:34 +0200
committerunknown <bell@sanja.is.com.ua>2003-01-14 18:00:34 +0200
commita0a1af4749730ccaba734be53563385031cc4f44 (patch)
tree6d78da4d0e27ac1f407b8d3a712252ab1bb542bb /mysql-test/r/union.result
parent0260f311dcbf9cda0b2634655ad40458d8606f4b (diff)
downloadmariadb-git-a0a1af4749730ccaba734be53563385031cc4f44.tar.gz
after merging fixing
include/m_string.h: added include to va_list bicame known mysql-test/r/union.result: some changing in error message sql/sql_base.cc: error detection moved sql/sql_lex.cc: new flag to detect table name error sql/sql_lex.h: new flag to detect table name error sql/sql_yacc.yy: check possibility of using table name added
Diffstat (limited to 'mysql-test/r/union.result')
-rw-r--r--mysql-test/r/union.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index 94f304c77b1..e546a8c8284 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -85,7 +85,7 @@ a b
2 b
1 a
(select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by t1.b;
-Table 't1' from one of SELECT's can not be used in order clause
+Table 't1' from one of SELECT's can not be used in global ORDER clause
explain (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc;
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 ALL NULL NULL NULL NULL 4