summaryrefslogtreecommitdiff
path: root/sql/item_xmlfunc.cc
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2013-09-25 17:16:13 +0300
committerunknown <sanja@askmonty.org>2013-09-25 17:16:13 +0300
commit64d6d8334fa63a0faa6d91ded21eca8e3871c7ec (patch)
treec313ec7d9f9db0c90649df5297e2d39230986291 /sql/item_xmlfunc.cc
parent72dffd878e47e4fcfd224cadfea06caed0ac956b (diff)
parentec7da1561e028aac40dee69433113978c982ce84 (diff)
downloadmariadb-git-64d6d8334fa63a0faa6d91ded21eca8e3871c7ec.tar.gz
merge 5.3 -> 5.5
Diffstat (limited to 'sql/item_xmlfunc.cc')
-rw-r--r--sql/item_xmlfunc.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc
index 723429f107a..e238668d6ab 100644
--- a/sql/item_xmlfunc.cc
+++ b/sql/item_xmlfunc.cc
@@ -2604,7 +2604,6 @@ void Item_xml_str_func::fix_length_and_dec()
status_var_increment(current_thd->status_var.feature_xml);
nodeset_func= 0;
- set_persist_maybe_null(1);
if (agg_arg_charsets_for_comparison(collation, args, arg_count))
return;