Merge mysql.com:/d2/hf/common/my50-common

into  mysql.com:/d2/hf/opt/my50-opt

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index 5b2ab419b77..69ac78d859b 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -362,7 +362,7 @@ public:
   enum Item_result type() { return res_type; }
   enum_field_types field_type() { return res_field_type; }
   virtual void exclude()= 0;
-  bool may_be_null() { return maybe_null; };
+  virtual bool may_be_null() { return maybe_null; };
   virtual table_map upper_select_const_tables()= 0;
   static table_map calc_const_tables(TABLE_LIST *);
   virtual void print(String *str)= 0;
@@ -399,6 +399,7 @@ public:
   void print (String *str);
   bool change_result(Item_subselect *si, select_subselect *result);
   bool no_tables();
+  bool may_be_null();
   bool is_executed() const { return executed; }
   bool no_rows();
 };