Merge in the fix for LPBUG#730604, and a corrected fix for LP BUG#719198,

after Monty's review.

2 files changed, 2 insertions, 1 deletions

diff --git a/sql/item.h b/sql/item.h
index 5c84d9f9598..adbf7103de1 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -3437,6 +3437,7 @@ public:
 
   virtual void store(Item *item);
   virtual bool cache_value()= 0;
+  bool is_null() { return null_value; }
 };
 
 
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 7d9f5b5b3ed..f10655c3e51 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3104,7 +3104,7 @@ bool select_materialize_with_stats::send_data(List<Item> &items)
 
   while ((cur_item= item_it++))
   {
-    if (cur_item->is_null())
+    if (cur_item->is_null_result())
     {
       ++cur_col_stat->null_count;
       cur_col_stat->max_null_row= count_rows;