after merge fixes

mysql-test/t/union.test:
  Auto merged

1 files changed, 16 insertions, 0 deletions

diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index e23b1c8a326..a63358ff2bc 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -872,6 +872,22 @@ count(*)
 show status like 'Slow_queries';
 Variable_name	Value
 Slow_queries	7
+flush status;
+select a from t1 where b not in (1,2,3) union select a from t1 where b not in (4,5,6);
+a
+4
+5
+3
+6
+7
+8
+9
+10
+1
+2
+show status like 'Slow_queries';
+Variable_name	Value
+Slow_queries	1
 drop table t1;
 create table t1 (   RID int(11) not null default '0',   IID int(11) not null default '0',    nada varchar(50)  not null,NAME varchar(50) not null,PHONE varchar(50) not null) engine=MyISAM;
 insert into t1 ( RID,IID,nada,NAME,PHONE) values (1, 1, 'main', 'a', '111'), (2, 1, 'main', 'b', '222'), (3, 1, 'main', 'c', '333'), (4, 1, 'main', 'd', '444'), (5, 1, 'main', 'e', '555'), (6, 2, 'main', 'c', '333'), (7, 2, 'main', 'd', '454'), (8, 2, 'main', 'e', '555'), (9, 2, 'main', 'f', '666'), (10, 2, 'main', 'g', '777');