diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-08-27 21:26:00 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-08-27 21:26:00 -0400 |
| commit | 94eb7e4145f12f5cff0940885a06956cd38bfdc6 (patch) | |
| tree | efad7721459c6981e965007a5b594a5ac8893e19 /sql/item_cmpfunc.h | |
| parent | cd822e347bca8531e671ca884ac08866e122f9e5 (diff) | |
| parent | f5d4eb89e246337182d6751e66ee1a1f4b2cfff7 (diff) | |
| download | mariadb-git-94eb7e4145f12f5cff0940885a06956cd38bfdc6.tar.gz | |
Merge
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/create.result:
merge
mysql-test/t/create.test:
merge
sql/item_cmpfunc.h:
SCCS merged
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 5c06f4fa1df..9379df84199 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -280,6 +280,8 @@ public: class Item_func_ifnull :public Item_func { enum Item_result cached_result_type; + enum_field_types cached_field_type; + bool field_type_defined; public: Item_func_ifnull(Item *a,Item *b) :Item_func(a,b), cached_result_type(INT_RESULT) @@ -288,8 +290,10 @@ public: longlong val_int(); String *val_str(String *str); enum Item_result result_type () const { return cached_result_type; } + enum_field_types field_type() const; void fix_length_and_dec(); const char *func_name() const { return "ifnull"; } + Field *tmp_table_field(TABLE *table); table_map not_null_tables() const { return 0; } }; |