From fd9d70a072926cccb002b283a02687acd8deeed6 Mon Sep 17 00:00:00 2001
From: unknown <bar@mysql.com>
Date: Fri, 7 Apr 2006 11:04:33 +0500
Subject: Bug#18285: ExtractValue not returning character data within
 <![CDATA[]]> as expected

mysql-test/r/xml.result:
  Adding test case
mysql-test/t/xml.test:
  Adding test case
strings/xml.c:
  Adding missing support of CDATA sections.
---
 mysql-test/r/xml.result | 3 +++
 mysql-test/t/xml.test   | 6 ++++++
 2 files changed, 9 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/r/xml.result b/mysql-test/r/xml.result
index 52f80000015..03fff98f1d4 100644
--- a/mysql-test/r/xml.result
+++ b/mysql-test/r/xml.result
@@ -609,6 +609,9 @@ extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin)
 select extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]');
 extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]')
 
+select ExtractValue('<tag1><![CDATA[test]]></tag1>','/tag1');
+ExtractValue('<tag1><![CDATA[test]]></tag1>','/tag1')
+test
 select extractValue('<e>1</e>','position()');
 ERROR HY000: XPATH syntax error: ''
 select extractValue('<e>1</e>','last()');
diff --git a/mysql-test/t/xml.test b/mysql-test/t/xml.test
index af3ec2d827e..0dda1922b8d 100644
--- a/mysql-test/t/xml.test
+++ b/mysql-test/t/xml.test
@@ -278,6 +278,12 @@ select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]');
 select extractvalue('<a>Jack</a>','/a[contains(../a,"j")]' collate latin1_bin);
 select extractvalue('<a>Jack</a>' collate latin1_bin,'/a[contains(../a,"j")]');
 
+#
+# Bug#18285: ExtractValue not returning character
+# data within <![CDATA[]]> as expected
+#
+select ExtractValue('<tag1><![CDATA[test]]></tag1>','/tag1');
+
 #
 # Bug #18171 XML: ExtractValue: the XPath position()
 # function crashes the server!
-- 
cgit v1.2.1