diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-12-03 11:37:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-12-03 11:37:26 +0100 |
| commit | ec4137c62b00a2bad91dd108f5782b206fe86a8b (patch) | |
| tree | b284d929d1a498df14aafffd0c31831f2b4e9fd5 /mysql-test/r/union.result | |
| parent | 1caee393076dc642a7d8e1283377b59ef8f52dbd (diff) | |
| parent | bafe529af76a915f43dbf6a3fb8dc610a4ea121b (diff) | |
| download | mariadb-git-ec4137c62b00a2bad91dd108f5782b206fe86a8b.tar.gz | |
Merge branch '10.1' into bb-10.1-merge
Diffstat (limited to 'mysql-test/r/union.result')
| -rw-r--r-- | mysql-test/r/union.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 6d086163aff..ef1749eda52 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -1617,7 +1617,7 @@ NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL NULL Using filesort 3 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: Note 1276 Field or reference 'a' of SELECT #3 was resolved in SELECT #-1 -Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` union select `test`.`t1`.`a` AS `a` from `test`.`t1` order by <expr_cache><>((select `a` from `test`.`t2` where (`test`.`t2`.`b` = 12))) +Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` union select `test`.`t1`.`a` AS `a` from `test`.`t1` order by <expr_cache><`a`>((select `a` from `test`.`t2` where (`test`.`t2`.`b` = 12))) # Should not crash SELECT * FROM t1 UNION SELECT * FROM t1 ORDER BY (SELECT a FROM t2 WHERE b = 12); |