diff options
| author | unknown <bar@mysql.com> | 2006-03-02 10:42:08 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-03-02 10:42:08 +0400 |
| commit | 526d28f36a8e5cabbec495d5745230faa0471011 (patch) | |
| tree | 870c8c101fe7f45878a5679e849ae600cb287094 /mysql-test/t/xml.test | |
| parent | 605c82d2a8502d4114a0ab1768ccf894903699e6 (diff) | |
| parent | 3f480fcb9f726f65925526045e036b16ecc2d8fa (diff) | |
| download | mariadb-git-526d28f36a8e5cabbec495d5745230faa0471011.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
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
Diffstat (limited to 'mysql-test/t/xml.test')
| -rw-r--r-- | mysql-test/t/xml.test | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/xml.test b/mysql-test/t/xml.test index fa7599df898..6a91d785d4e 100644 --- a/mysql-test/t/xml.test +++ b/mysql-test/t/xml.test @@ -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'); |