From c652c92f75e60d090a6b71d77492b56f85ca3d7e Mon Sep 17 00:00:00 2001
From: unknown <bar@mysql.com>
Date: Fri, 10 Feb 2006 13:24:10 +0400
Subject:   Bug#16234 XML: Crash if ExtractValue()   Also fixes 16314: XML:
 extractvalue() crash if vertical bar xml.result, xml.test:   Adding test case
 item_xmlfunc.cc:   Using root element as a context node,   instead of NULL,
 with relative paths.

sql/item_xmlfunc.cc:
  Bug#16234 XML: Crash if ExtractValue()
  Also fixes 16314: XML: extractvalue() crash if vertical bar
  Use root element as a context node,
  instead of NULL, with relative paths.
mysql-test/t/xml.test:
  Adding test case
mysql-test/r/xml.result:
  Adding test case
---
 mysql-test/r/xml.result | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'mysql-test/r/xml.result')

diff --git a/mysql-test/r/xml.result b/mysql-test/r/xml.result
index 693dd6eea81..4d66e034964 100644
--- a/mysql-test/r/xml.result
+++ b/mysql-test/r/xml.result
@@ -520,3 +520,25 @@ UpdateXML(@xml, '/a/b/@bb2', '')
 select UpdateXML(@xml, '/a/b/@bb2', 'bb3="bb3"');
 UpdateXML(@xml, '/a/b/@bb2', 'bb3="bb3"')
 <a aa1="aa1" aa2="aa2"><b bb1="bb1" bb3="bb3">bb</b></a>
+SET @xml= '<order><clerk>lesser wombat</clerk></order>';
+select extractvalue(@xml,'order/clerk');
+extractvalue(@xml,'order/clerk')
+lesser wombat
+select extractvalue(@xml,'/order/clerk');
+extractvalue(@xml,'/order/clerk')
+lesser wombat
+select extractvalue('<a><b>B</b></a>','/a|/b');
+extractvalue('<a><b>B</b></a>','/a|/b')
+
+select extractvalue('<a><b>B</b></a>','/a|b');
+extractvalue('<a><b>B</b></a>','/a|b')
+
+select extractvalue('<a>a<b>B</b></a>','/a|/b');
+extractvalue('<a>a<b>B</b></a>','/a|/b')
+a
+select extractvalue('<a>a<b>B</b></a>','/a|b');
+extractvalue('<a>a<b>B</b></a>','/a|b')
+a
+select extractvalue('<a>a<b>B</b></a>','a|/b');
+extractvalue('<a>a<b>B</b></a>','a|/b')
+a
-- 
cgit v1.2.1