diff options
| author | Alexander Barkov <bar@mysql.com> | 2010-11-11 13:31:17 +0300 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2010-11-11 13:31:17 +0300 |
| commit | bd165aa4f02997f193e6d65ccd536a3e2ae6680f (patch) | |
| tree | 72af241003ca0446fc03f8477a0931aba15f6eb7 /sql/item_xmlfunc.cc | |
| parent | ddd6fbe553709c91d7d6b08620f45d789a046897 (diff) | |
| parent | aa668865e271694e9b3ebbfe518cb4d0c2ad0c38 (diff) | |
| download | mariadb-git-bd165aa4f02997f193e6d65ccd536a3e2ae6680f.tar.gz | |
Merging from mysql-5.1-security
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index f124c37f0eb..49d18b1bb0f 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -2798,12 +2798,12 @@ String *Item_func_xml_extractvalue::val_str(String *str) null_value= 0; if (!nodeset_func || !(res= args[0]->val_str(str)) || - !parse_xml(res, &pxml)) + !parse_xml(res, &pxml) || + !(res= nodeset_func->val_str(&tmp_value))) { null_value= 1; return 0; } - res= nodeset_func->val_str(&tmp_value); return res; } |