Commit 3455bc53 authored by unknown's avatar unknown
Browse files

fixed test 'subselect' in case when innodb is not compiled in (thanks HF who niticed it) 


mysql-test/r/subselect.result:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'
mysql-test/r/subselect_innodb.result:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'
mysql-test/t/subselect.test:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'
mysql-test/t/subselect_innodb.test:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'
parent e244a3a9

mysql-test/r/subselect.result

+0 −12
Original line number Diff line number Diff line
@@ -2196,15 +2196,3 @@ ERROR 42S22: Reference 'xx' not supported (forward reference in item list) 
select 1 = ALL (select 1 from t1 where 1 = xx ), 1 as xx from DUAL;

ERROR 42S22: Reference 'xx' not supported (forward reference in item list)

drop table t1;
 
CREATE TABLE `t1` ( `a` char(3) NOT NULL default '', `b` char(3) NOT NULL default '', `c` char(3) NOT NULL default '', PRIMARY KEY  (`a`,`b`,`c`)) ENGINE=InnoDB;

CREATE TABLE t2 LIKE t1;

INSERT INTO t1 VALUES (1,1,1);

INSERT INTO t2 VALUES (1,1,1);

PREPARE my_stmt FROM "SELECT t1.b, count(*) FROM t1 group by t1.b having

count(*) > ALL (SELECT COUNT(*) FROM t2 WHERE t2.a=1 GROUP By t2.b)";

EXECUTE my_stmt;

b	count(*)

EXECUTE my_stmt;

b	count(*)

deallocate prepare my_stmt;

drop table t1,t2;

mysql-test/r/subselect_innodb.result

+12 −0
Original line number Diff line number Diff line
@@ -140,3 +140,15 @@ id date1 coworkerid description sum_used sum_remaining comments 
6	2004-01-01	1	test	22	33	comment

7	2004-01-01	1	test	22	33	comment

drop table t1;

CREATE TABLE `t1` ( `a` char(3) NOT NULL default '', `b` char(3) NOT NULL default '', `c` char(3) NOT NULL default '', PRIMARY KEY  (`a`,`b`,`c`)) ENGINE=InnoDB;

CREATE TABLE t2 LIKE t1;

INSERT INTO t1 VALUES (1,1,1);

INSERT INTO t2 VALUES (1,1,1);

PREPARE my_stmt FROM "SELECT t1.b, count(*) FROM t1 group by t1.b having

count(*) > ALL (SELECT COUNT(*) FROM t2 WHERE t2.a=1 GROUP By t2.b)";

EXECUTE my_stmt;

b	count(*)

EXECUTE my_stmt;

b	count(*)

deallocate prepare my_stmt;

drop table t1,t2;

mysql-test/t/subselect.test

+0 −14
Original line number Diff line number Diff line
@@ -1465,17 +1465,3 @@ select 1 = ALL (select 1 from t1 where 1 = xx ), 1 as xx; 
-- error 1247

select 1 = ALL (select 1 from t1 where 1 = xx ), 1 as xx from DUAL;

drop table t1;
 


#

# cleaning up of results of subselects (BUG#8125)

#

CREATE TABLE `t1` ( `a` char(3) NOT NULL default '', `b` char(3) NOT NULL default '', `c` char(3) NOT NULL default '', PRIMARY KEY  (`a`,`b`,`c`)) ENGINE=InnoDB;

CREATE TABLE t2 LIKE t1;

INSERT INTO t1 VALUES (1,1,1);

INSERT INTO t2 VALUES (1,1,1);

PREPARE my_stmt FROM "SELECT t1.b, count(*) FROM t1 group by t1.b having

count(*) > ALL (SELECT COUNT(*) FROM t2 WHERE t2.a=1 GROUP By t2.b)";

EXECUTE my_stmt;

EXECUTE my_stmt;

deallocate prepare my_stmt;

drop table t1,t2;

mysql-test/t/subselect_innodb.test

+14 −0
Original line number Diff line number Diff line
@@ -145,3 +145,17 @@ SELECT DISTINCT 
 FROM t1;

select * from t1;

drop table t1;



#

# cleaning up of results of subselects (BUG#8125)

#

CREATE TABLE `t1` ( `a` char(3) NOT NULL default '', `b` char(3) NOT NULL default '', `c` char(3) NOT NULL default '', PRIMARY KEY  (`a`,`b`,`c`)) ENGINE=InnoDB;

CREATE TABLE t2 LIKE t1;

INSERT INTO t1 VALUES (1,1,1);

INSERT INTO t2 VALUES (1,1,1);

PREPARE my_stmt FROM "SELECT t1.b, count(*) FROM t1 group by t1.b having

count(*) > ALL (SELECT COUNT(*) FROM t2 WHERE t2.a=1 GROUP By t2.b)";

EXECUTE my_stmt;

EXECUTE my_stmt;

deallocate prepare my_stmt;

drop table t1,t2;