merge

sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

1 files changed, 13 insertions, 0 deletions

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index c43a7d87f8f..7bc70052920 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -537,9 +537,22 @@ void Item_sum_hybrid::cleanup()
   DBUG_ENTER("Item_sum_hybrid::cleanup");
   Item_sum::cleanup();
   used_table_cache= ~(table_map) 0;
+  /*
+    by default is is TRUE to avoid TRUE reporting by
+    Item_func_not_all/Item_func_nop_all if this item was never called.
+
+    no_rows_in_result() set it to FALSE if was not results found.
+  */
+  was_values= TRUE;
   DBUG_VOID_RETURN;
 }
 
+void Item_sum_hybrid::no_rows_in_result()
+{
+  Item_sum::no_rows_in_result();
+  was_values= FALSE;
+}
+
 
 Item *Item_sum_min::copy_or_same(THD* thd)
 {