Commit dabd0193 authored by unknown's avatar unknown
Browse files

after merge fixes 


mysql-test/t/union.test:
  Auto merged
parents e07b3d46 59ef5bed

mysql-test/r/union.result

+16 −0
Original line number Diff line number Diff line
@@ -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');

mysql-test/t/union.test

+4 −0
Original line number Diff line number Diff line
@@ -499,6 +499,10 @@ select count(*) from t1 where b=13 union select count(*) from t1 where a=7; 
show status like 'Slow_queries';

select count(*) from t1 where a=7 union select count(*) from t1 where b=13;

show status like 'Slow_queries';

# additional test for examined rows

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); 

show status like 'Slow_queries';

drop table t1;



#

sql/sql_union.cc

+7 −4
Original line number Diff line number Diff line
@@ -478,11 +478,14 @@ bool st_select_lex_unit::exec() 
	}

	res= sl->join->error;

	offset_limit_cnt= sl->offset_limit;

	if (!res && union_result->flush())

	if (!res)

	{

	  examined_rows+= thd->examined_row_count;

	  if (union_result->flush())

	  {

	    thd->lex->current_select= lex_select_save;

	  DBUG_RETURN(TRUE);

	    DBUG_RETURN(1);

	  }

	}

      }

      if (res)