diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-09-26 19:06:54 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-09-26 19:06:54 +0300 |
| commit | bc25c6cafbb9e8c3b849f8077cd9bd487e000551 (patch) | |
| tree | 72aa6cfe7d2fc332845cce73577dd273ccaa5f64 /sql/item_cmpfunc.h | |
| parent | c89bc705a9e300d12a64dffe4df89ec3564d76a0 (diff) | |
| download | mariadb-git-bc25c6cafbb9e8c3b849f8077cd9bd487e000551.tar.gz | |
merge of the fix for bug 27802 & 27216 to 5.1-opt
mysql-test/r/view.result:
merge of the fix for bug 27802 to 5.1
sql/item_cmpfunc.h:
merge of the fix for bug 27216 to 5.1
sql/sql_insert.cc:
merge of the fix for bug 27216 to 5.1
sql/sql_lex.h:
merge of the fix for bug 27802 to 5.1
sql/sql_select.cc:
merge of the fix for bug 27802 to 5.1
sql/table.h:
merge of the fix for bug 27802 to 5.1
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 1a64f9c4211..e9aeef7fc3e 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1108,6 +1108,7 @@ class Item_func_case :public Item_func uint ncases; Item_result cmp_type; DTCollation cmp_collation; + enum_field_types cached_field_type; cmp_item *cmp_items[5]; /* For all result types */ cmp_item *case_item; public: @@ -1138,6 +1139,7 @@ public: uint decimal_precision() const; table_map not_null_tables() const { return 0; } enum Item_result result_type () const { return cached_result_type; } + enum_field_types field_type() const { return cached_field_type; } const char *func_name() const { return "case"; } void print(String *str); Item *find_item(String *str); |