diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-01 09:33:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-01 09:33:03 +0300 |
| commit | d72eebaa3dbec025ec43d101a1c8055cfd1ddaef (patch) | |
| tree | 5b2dea3a82cbef8c6b0689ad02419d5bf4e2bf82 /sql/item_xmlfunc.cc | |
| parent | 4832b751ad47626f236e25067508230df72749e6 (diff) | |
| parent | 49854811fa499c70ddbf5d7d4daf22c97796b98e (diff) | |
| download | mariadb-git-d72eebaa3dbec025ec43d101a1c8055cfd1ddaef.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index 9cc123e57d6..f43402dfe48 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -815,7 +815,6 @@ String *Item_nodeset_func_attributebyname::val_nodeset(String *nodeset) String *Item_nodeset_func_predicate::val_nodeset(String *str) { Item_nodeset_func *nodeset_func= (Item_nodeset_func*) args[0]; - Item_func *comp_func= (Item_func*)args[1]; uint pos= 0, size; prepare(str); size= (uint)(fltend - fltbeg); @@ -825,7 +824,7 @@ String *Item_nodeset_func_predicate::val_nodeset(String *str) ((XPathFilter*)(&nodeset_func->context_cache))->append_element(flt->num, flt->pos, size); - if (comp_func->val_int()) + if (args[1]->val_int()) ((XPathFilter*)str)->append_element(flt->num, pos++); } return str; |