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

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse source 
into  mysql.com:/usr/home/bar/mysql-5.1-new.16315


sql/item_xmlfunc.cc:
  Auto merged
mysql-test/r/xml.result:
  After merge fix
mysql-test/t/xml.test:
  After merge fix
This commit is contained in:
unknown 2006-03-02 10:42:08 +04:00
commit 526d28f36a
3 changed files with 47 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/t/xml.test
View file

@ -23,6 +23,7 @@ SELECT extractValue(@xml,'/*/*');
SELECT extractValue(@xml,'/*/*/*');
SELECT extractValue(@xml,'/a/child::*');
SELECT extractValue(@xml,'/a/self::*');
SELECT extractValue(@xml,'/a/descendant::*');
SELECT extractValue(@xml,'/a/descendant-or-self::*');
SELECT extractValue(@xml,'/a/attribute::*');
@ -245,6 +246,11 @@ select extractvalue('<a>A</a>','/<a>');
select extractvalue('<a><b>b</b><b!>b!</b!></a>','//b!');
#
# Bug #16315 XML: extractvalue() handles self badly
#
select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant::*');
select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/self::*');
select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*');
# Bug #16320 XML: extractvalue() won't accept names containing underscores
#
select extractvalue('<A_B>A</A_B>','/A_B');