summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-01-16 17:38:38 +0200
committerGeorgi Kodinov <joro@sun.com>2009-01-16 17:38:38 +0200
commit4d8e73c8186e13d2136d15716cfeaedc55965e05 (patch)
treef0b8464ee2d3fcb57c8c4fe4de1ec5a91e090f3d /sql/item.h
parent47bd8d19fd9a6eb8d6a314452db4a916a84adae9 (diff)
parentbdec5458aebded82d52cb535810ad73be244b690 (diff)
downloadmariadb-git-4d8e73c8186e13d2136d15716cfeaedc55965e05.tar.gz
merged 5.0-bugteam -> 5.1-bugteam
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h
index 8c58f0cebe9..be9daf672f0 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -729,6 +729,7 @@ public:
virtual my_decimal *val_decimal_result(my_decimal *val)
{ return val_decimal(val); }
virtual bool val_bool_result() { return val_bool(); }
+ virtual bool is_null_result() { return is_null(); }
/* bit map of tables used by item */
virtual table_map used_tables() const { return (table_map) 0L; }
@@ -1436,6 +1437,7 @@ public:
String *str_result(String* tmp);
my_decimal *val_decimal_result(my_decimal *);
bool val_bool_result();
+ bool is_null_result();
bool send(Protocol *protocol, String *str_arg);
void reset_field(Field *f);
bool fix_fields(THD *, Item **);
@@ -2178,6 +2180,7 @@ public:
String *str_result(String* tmp);
my_decimal *val_decimal_result(my_decimal *);
bool val_bool_result();
+ bool is_null_result();
bool send(Protocol *prot, String *tmp);
void make_field(Send_field *field);
bool fix_fields(THD *, Item **);