diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-03 11:13:01 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-03 11:13:01 +0400 |
| commit | 6a4fbf09bec454762c09afd33e264d1a7999597e (patch) | |
| tree | 67158e1231a13e0031e1b313303882ddd6a05ba4 /sql/item_subselect.h | |
| parent | 42a7506d288a7666b666f9b514e7bbb2b1dc88dd (diff) | |
| parent | 4c737cf1428c4b08bafd9888b86c8aed6002380b (diff) | |
| download | mariadb-git-6a4fbf09bec454762c09afd33e264d1a7999597e.tar.gz | |
Merge mysql.com:/d2/hf/common/my50-common
into mysql.com:/d2/hf/opt/my50-opt
myisam/mi_check.c:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 3 |
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(); }; |