bk commit into 5.1 tree (bar:1.2298) BUG#18285

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2298 06/04/07 11:04:33 bar@stripped +3 -0
  Bug#18285: ExtractValue not returning character data within <![CDATA[]]> as expected

  strings/xml.c
    1.10 06/04/07 11:04:23 bar@stripped +22 -0
    Adding missing support of CDATA sections.

  mysql-test/t/xml.test
    1.11 06/04/07 11:04:23 bar@stripped +6 -0
    Adding test case

  mysql-test/r/xml.result
    1.11 06/04/07 11:04:23 bar@stripped +3 -0
    Adding test case

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1-new.b18285

--- 1.9/strings/xml.c	2005-12-21 17:09:32 +04:00
+++ 1.10/strings/xml.c	2006-04-07 11:04:23 +05:00
@@ -30,6 +30,7 @@
 #define MY_XML_TEXT	'T'
 #define MY_XML_QUESTION	'?'
 #define MY_XML_EXCLAM   '!'
+#define MY_XML_CDATA    'D'
 
 typedef struct xml_attr_st
 {
@@ -45,6 +46,7 @@ static const char *lex2str(int lex)
     case MY_XML_EOF:      return "EOF";
     case MY_XML_STRING:   return "STRING";
     case MY_XML_IDENT:    return "IDENT";
+    case MY_XML_CDATA:    return "CDATA";
     case MY_XML_EQ:       return "'='";
     case MY_XML_LT:       return "'<'";
     case MY_XML_GT:       return "'>'";
@@ -90,6 +92,20 @@ static int my_xml_scan(MY_XML_PARSER *p,
     a->end=p->cur;
     lex=MY_XML_COMMENT;
   }
+  else if (!bcmp(p->cur, "<![CDATA[",9))
+  {
+    p->cur+= 9;
+    for (; p->cur < p->end - 2 ; p->cur++)
+    {
+      if (p->cur[0] == ']' && p->cur[1] == ']' && p->cur[2] == '>')
+      {
+        p->cur+= 3;
+        a->end= p->cur;
+        break;
+      }
+    }
+    lex= MY_XML_CDATA;
+  }
   else if (strchr("?=/<>!",p->cur[0]))
   {
     p->cur++;
@@ -215,7 +231,13 @@ int my_xml_parse(MY_XML_PARSER *p,const 
       lex=my_xml_scan(p,&a);
       
       if (MY_XML_COMMENT == lex)
+        continue;
+      
+      if (lex == MY_XML_CDATA)
       {
+        a.beg+= 9;
+        a.end-= 3;
+        my_xml_value(p, a.beg, (uint) (a.end-a.beg));
         continue;
       }
       

--- 1.10/mysql-test/r/xml.result	2006-03-20 14:53:12 +04:00
+++ 1.11/mysql-test/r/xml.result	2006-04-07 11:04:23 +05:00
@@ -609,6 +609,9 @@ extractvalue('<a>Jack</a>','/a[contains(
 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()');

--- 1.10/mysql-test/t/xml.test	2006-03-20 14:53:06 +04:00
+++ 1.11/mysql-test/t/xml.test	2006-04-07 11:04:23 +05:00
@@ -279,6 +279,12 @@ select extractvalue('<a>Jack</a>','/a[co
 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!
 #