diff options
author | unknown <sanja@askmonty.org> | 2013-09-25 17:16:13 +0300 |
---|---|---|
committer | unknown <sanja@askmonty.org> | 2013-09-25 17:16:13 +0300 |
commit | 64d6d8334fa63a0faa6d91ded21eca8e3871c7ec (patch) | |
tree | c313ec7d9f9db0c90649df5297e2d39230986291 /sql/item_xmlfunc.h | |
parent | 72dffd878e47e4fcfd224cadfea06caed0ac956b (diff) | |
parent | ec7da1561e028aac40dee69433113978c982ce84 (diff) | |
download | mariadb-git-64d6d8334fa63a0faa6d91ded21eca8e3871c7ec.tar.gz |
merge 5.3 -> 5.5
Diffstat (limited to 'sql/item_xmlfunc.h')
-rw-r--r-- | sql/item_xmlfunc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/item_xmlfunc.h b/sql/item_xmlfunc.h index 3356b4ac902..800cf6ed760 100644 --- a/sql/item_xmlfunc.h +++ b/sql/item_xmlfunc.h @@ -34,10 +34,14 @@ protected: public: Item_xml_str_func(Item *a, Item *b): Item_str_func(a,b) - {} + { + maybe_null= TRUE; + } Item_xml_str_func(Item *a, Item *b, Item *c): Item_str_func(a,b,c) - {} + { + maybe_null= TRUE; + } void fix_length_and_dec(); String *parse_xml(String *raw_xml, String *parsed_xml_buf); bool check_vcol_func_processor(uchar *int_arg) |