5.3->5.5 merge

1 files changed, 2 insertions, 0 deletions

diff --git a/sql/item_row.cc b/sql/item_row.cc
index df03b0e0ebb..ccd7a37e9b7 100644
--- a/sql/item_row.cc
+++ b/sql/item_row.cc
@@ -156,11 +156,13 @@ void Item_row::fix_after_pullout(st_select_lex *new_parent, Item **ref)
 {
   used_tables_cache= 0;
   const_item_cache= 1;
+  not_null_tables_cache= 0;
   for (uint i= 0; i < arg_count; i++)
   {
     items[i]->fix_after_pullout(new_parent, &items[i]);
     used_tables_cache|= items[i]->used_tables();
     const_item_cache&= items[i]->const_item();
+    not_null_tables_cache|= items[i]->not_null_tables();
   }
 }