diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-02 10:25:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-02 10:25:11 +0300 |
| commit | 8300f639a14afeb379c224e10dab9d99d31cecbd (patch) | |
| tree | c67c0a5afc6062b99ec21194a99b81d3633f8c38 /sql/item_xmlfunc.cc | |
| parent | 804761a844906c7f7bd11139a366a5dfc1d8bcd6 (diff) | |
| parent | 50641db2d11ad8a2228f7938d851e52decb71a9b (diff) | |
| download | mariadb-git-8300f639a14afeb379c224e10dab9d99d31cecbd.tar.gz | |
Merge 10.2 into 10.3
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 6017a0fa8af..c413969e3df 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; |