diff options
| author | monty@mysql.com <> | 2004-02-16 10:31:05 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-16 10:31:05 +0200 |
| commit | 050af89dd8034046df593c1ac7e060ee37bfdf27 (patch) | |
| tree | e792af64f95eba198633387e3b36f50f096c3001 /mysql-test/t/union.test | |
| parent | 25aff697d17d023b1fe0c085f3215a1358832e5e (diff) | |
| parent | d1d48a9dd5e3a6ff3d5aadf9234d66777216b682 (diff) | |
| download | mariadb-git-050af89dd8034046df593c1ac7e060ee37bfdf27.tar.gz | |
Merge with public tree
Diffstat (limited to 'mysql-test/t/union.test')
| -rw-r--r-- | mysql-test/t/union.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index 6c3a22a33cf..c88ac4e70d8 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -23,7 +23,7 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g (select a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 4; (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1); (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc; ---error 1249 +--error 1250 (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by t1.b; explain extended (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc; (select sql_calc_found_rows a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 2; @@ -420,7 +420,7 @@ create table t1 select 1 union select -1; select * from t1; show create table t1; drop table t1; --- error 1266 +-- error 1267 create table t1 select _latin1"test" union select _latin2"testt" ; create table t1 select _latin2"test" union select _latin2"testt" ; show create table t1; |