summaryrefslogtreecommitdiff
path: root/sql/item_xmlfunc.cc
diff options
context:
space:
mode:
authorkostja@bodhi.local <>2006-07-14 02:07:37 +0400
committerkostja@bodhi.local <>2006-07-14 02:07:37 +0400
commit436e7a2dd9d70832be7ee07b4a5ebed3387d9631 (patch)
treefdfdf2b6811d16be43f65fa0c95ba8b80a508c84 /sql/item_xmlfunc.cc
parentd7845b74db59efb3bc8ffc74cbe3a3d7c5607196 (diff)
downloadmariadb-git-436e7a2dd9d70832be7ee07b4a5ebed3387d9631.tar.gz
Post-merge fixes.
Diffstat (limited to 'sql/item_xmlfunc.cc')
-rw-r--r--sql/item_xmlfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc
index fb5ca083eab..ed4b81c897f 100644
--- a/sql/item_xmlfunc.cc
+++ b/sql/item_xmlfunc.cc
@@ -2396,7 +2396,7 @@ void Item_xml_str_func::fix_length_and_dec()
nodeset_func= 0;
- if (agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV))
+ if (agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV, 1))
return;
if (collation.collation->mbminlen > 1)