1 files changed, 35 insertions, 0 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index 94860ceec2d..a53427f7fc6 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -1172,6 +1172,41 @@ deallocate prepare stmt1;
 --echo End of 5.1 tests
 
 --echo #
+--echo # mdev-5091: Asseirtion failure for UNION with ORDER BY 
+--echo #            in one of selects
+--echo #
+ 
+ CREATE TABLE t1 (i int, c char(1)) ENGINE=MyISAM;
+ INSERT INTO t1 VALUES (6,'b');
+
+ CREATE VIEW v1 AS SELECT * FROM t1;
+
+ ( SELECT i FROM v1 GROUP BY i ORDER BY CONCAT( c, c ) LIMIT 1 )
+ UNION 
+ ( SELECT i FROM t1 );
+
+ DROP VIEW v1;
+ DROP TABLE t1;
+
+--echo #
+--echo # mdev-5382:  UNION with ORDER BY in subselect
+--echo #
+ 
+ CREATE TABLE t1 (a int DEFAULT NULL);
+ INSERT INTO t1 VALUES (2), (4);
+ CREATE TABLE t2 (b int DEFAULT NULL);
+ INSERT INTO t2 VALUES (1), (3);
+ 
+ SELECT c1 FROM (SELECT (SELECT a FROM t1 WHERE t1.a <= t2.b
+                         UNION ALL
+                         SELECT a FROM t1 WHERE t1.a+3<= t2.b
+                         ORDER BY a DESC) AS c1 FROM t2) t3;
+
+ DROP TABLE t1,t2;
+ 
+ --echo End of 5.3 tests
+
+--echo #
 --echo # Bug#57986 ORDER BY clause is not used after a UNION, 
 --echo #           if embedded in a SELECT
 --echo #