diff options
author | Georgi Kodinov <joro@sun.com> | 2009-01-16 16:48:41 +0200 |
---|---|---|
committer | Georgi Kodinov <joro@sun.com> | 2009-01-16 16:48:41 +0200 |
commit | bdec5458aebded82d52cb535810ad73be244b690 (patch) | |
tree | 39092b6ac4495ec75b00266ad34eafa5a91c6c2e /sql/item.h | |
parent | b6468e4a1af984b2c994d3f8d3ce57775ac3f41e (diff) | |
parent | e7a6e86f78998e35e1912f377006a35db3705246 (diff) | |
download | mariadb-git-bdec5458aebded82d52cb535810ad73be244b690.tar.gz |
auto merge
Diffstat (limited to 'sql/item.h')
-rw-r--r-- | sql/item.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 250bb3f67ef..1058cc5dbb8 100644 --- a/sql/item.h +++ b/sql/item.h @@ -652,6 +652,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; } @@ -1301,6 +1302,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 **); @@ -1942,6 +1944,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 **); |