mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-01 04:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge MySQL->MariaDB

Browse source 
* Finished Monty and Jani's merge
* Some InnoDB tests still fail (because it's old xtradb code run against
  newer testsuite). They are expected to go after mergning with the latest
  xtradb.
This commit is contained in:
Sergey Petrunya 2009-09-08 00:50:10 +04:00
commit 29f0dcb563
1190 changed files with 268606 additions and 17715 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/item_xmlfunc.cc
View file

@ -2788,6 +2788,7 @@ String *Item_xml_str_func::parse_xml(String *raw_xml, String *parsed_xml_buf)
String *Item_func_xml_extractvalue::val_str(String *str)
{
String *res;
null_value= 0;
if (!nodeset_func ||
!(res= args[0]->val_str(str)) ||
!parse_xml(res, &pxml))
@ -2804,6 +2805,7 @@ String *Item_func_xml_update::val_str(String *str)
{
String *res, *nodeset, *rep;
null_value= 0;
if (!nodeset_func ||
!(res= args[0]->val_str(str)) ||
!(rep= args[2]->val_str(&tmp_value3)) ||