mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merging from mysql-5.1-security

Browse source
This commit is contained in:
Alexander Barkov 2010-11-11 13:31:17 +03:00
commit 324cb45899
6 changed files with 50 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/item_xmlfunc.cc
View file

@ -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;
}