merge

1 files changed, 6 insertions, 1 deletions

diff --git a/sql/item.h b/sql/item.h
index 5e3c7c25042..1faed26e1ee 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -2110,7 +2110,11 @@ public:
       tab->merge_keys.merge(field->part_of_key);
       if (tab->read_set)
         bitmap_fast_test_and_set(tab->read_set, field->field_index);
-      if (field->vcol_info)
+      /* 
+        Do not mark a self-referecing virtual column.
+        Such virtual columns are reported as invalid.
+      */
+      if (field->vcol_info && tab->vcol_set)
         tab->mark_virtual_col(field);
     }
   }
@@ -3552,6 +3556,7 @@ public:
   void cleanup()
   {
     null_ref_table= NULL;
+    item_equal= NULL;
     Item_direct_ref::cleanup();
   }
 };