diff options
| author | unknown <kostja@bodhi.local> | 2006-07-14 02:07:37 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-14 02:07:37 +0400 |
| commit | 3657f34629eaa8ac37dc0dafad7a95dbe0b1180a (patch) | |
| tree | fdfdf2b6811d16be43f65fa0c95ba8b80a508c84 /sql/item_xmlfunc.cc | |
| parent | 3c3f9d9022800193c26caa599e85fc3685a4d1ff (diff) | |
| download | mariadb-git-3657f34629eaa8ac37dc0dafad7a95dbe0b1180a.tar.gz | |
Post-merge fixes.
mysql-test/mysql-test-run.sh:
A post-merge fix (apply a change lost during the merge).
sql/ha_ndbcluster.cc:
A post-merge fix: resolve a merge error.
sql/item.cc:
Fix a merge error.
sql/item_xmlfunc.cc:
Use the new signature of agg_arg_charsets.
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 2 |
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) |