Rolled back the patch for bug 791761.

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

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;

mysql-test/t/having.test

@@ -591,28 +591,3 @@ DROP TABLE t1,t2;
 
 
 --echo End of 5.1 tests
-
---echo #
---echo # LP bug #791761: MAX over an empty join + HAVING
---echo #
-
-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;
-SELECT MAX(t1.b)  FROM t1,t2 WHERE t2.a > 0 HAVING MAX(t1.b) IS NULL;
-
-EXPLAIN
-SELECT MAX(t1.b)  FROM t1,t2 WHERE t2.a < 0 HAVING MAX(t1.b) <> 6;
-SELECT MAX(t1.b)  FROM t1,t2 WHERE t2.a < 0 HAVING MAX(t1.b) <> 6;
-
-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 ;
-
-DROP TABLE t1,t2,t3;

sql/item.h

@@ -1032,7 +1032,6 @@ class Item {
   virtual bool update_table_bitmaps_processor(uchar *arg) { return 0; }
   virtual bool view_used_tables_processor(uchar *arg) { return 0; }
   virtual bool eval_not_null_tables(uchar *opt_arg) { return 0; }
-  virtual bool clear_sum_processor(uchar *opt_arg) { return 0; }
   virtual bool is_subquery_processor (uchar *opt_arg) { return 0; }
   virtual bool limit_index_condition_pushdown_processor(uchar *opt_arg)
   { 

sql/item_sum.h

@@ -390,7 +390,6 @@ class Item_sum :public Item_result_field
   {
     return trace_unsupported_by_check_vcol_func_processor(func_name()); 
   }
-  bool clear_sum_processor(uchar *arg) { clear(); return 0; }
 };
 
 

sql/sql_select.cc

@@ -10470,9 +10470,7 @@ return_zero_rows(JOIN *join, select_result *result, List<TABLE_LIST> &tables,
       if (!table->is_jtbm())
         mark_as_null_row(table->table);		// All fields are NULL
     }
-    if (having &&
-        !having->walk(&Item::clear_sum_processor, FALSE, NULL) &&
-        having->val_int() == 0)
+    if (having && having->val_int() == 0)
       send_row=0;
   }
   if (!(result->send_fields(fields,