Rolled back the patch for bug 791761.

A better fix for this bug will be pulled from mariadb-5.2.

1 files changed, 0 insertions, 24 deletions

diff --git a/mysql-test/r/having.result b/mysql-test/r/having.result
index e631c7dbe5a..fc2df2b7fc2 100644
--- a/mysql-test/r/having.result
+++ b/mysql-test/r/having.result
@@ -570,27 +570,3 @@ ORDER BY t1.f1;
 f1
 DROP TABLE t1,t2;
 End of 5.1 tests
-#
-# LP bug #791761: MAX over an empty join + HAVING
-#
-CREATE TABLE t1 (a int, b int , KEY (b)) ;
-INSERT INTO t1 VALUES (3,1);
-CREATE TABLE t2 (a int NOT NULL ) ;
-INSERT INTO t2 VALUES (29);
-SELECT MAX(t1.b)  FROM t1,t2 WHERE t2.a > 0 HAVING MAX(t1.b) <> 6;
-MAX(t1.b)
-1
-SELECT MAX(t1.b)  FROM t1,t2 WHERE t2.a > 0 HAVING MAX(t1.b) IS NULL;
-MAX(t1.b)
-EXPLAIN
-SELECT MAX(t1.b)  FROM t1,t2 WHERE t2.a < 0 HAVING MAX(t1.b) <> 6;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
-SELECT MAX(t1.b)  FROM t1,t2 WHERE t2.a < 0 HAVING MAX(t1.b) <> 6;
-MAX(t1.b)
-CREATE TABLE t3 ( f3 int) ;
-INSERT INTO t3 VALUES (NULL);
-SELECT MAX(t1.b) AS f FROM t1 JOIN t2 ON t2.a != 0
-WHERE (SELECT f3 FROM t3) <> 0 HAVING f <> 6 ;
-f
-DROP TABLE t1,t2,t3;