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 | 26855124d7fc8248bb7bc63d527a8c9515766857 (patch) | |
| tree | 870c8c101fe7f45878a5679e849ae600cb287094 /mysql-test/r/xml.result | |
| parent | 7545d772c3a91a07f7c1f77c14d608358722be26 (diff) | |
| parent | 0ef98d1807b8c1304eb7b9bf530b6b636748150f (diff) | |
| download | mariadb-git-26855124d7fc8248bb7bc63d527a8c9515766857.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/r/xml.result')
| -rw-r--r-- | mysql-test/r/xml.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/xml.result b/mysql-test/r/xml.result index b5ed4ef8b5a..0b75b50f754 100644 --- a/mysql-test/r/xml.result +++ b/mysql-test/r/xml.result @@ -65,6 +65,9 @@ c1 SELECT extractValue(@xml,'/a/child::*'); extractValue(@xml,'/a/child::*') b1 b2 +SELECT extractValue(@xml,'/a/self::*'); +extractValue(@xml,'/a/self::*') +a1 a2 SELECT extractValue(@xml,'/a/descendant::*'); extractValue(@xml,'/a/descendant::*') b1 c1 b2 @@ -546,6 +549,15 @@ select extractvalue('<a>A</a>','/<a>'); ERROR HY000: XPATH syntax error: '>' select extractvalue('<a><b>b</b><b!>b!</b!></a>','//b!'); ERROR HY000: XPATH syntax error: '!' +select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant::*'); +extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant::*') +B C +select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/self::*'); +extractvalue('<a>A<b>B<c>C</c></b></a>','/a/self::*') +A +select extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*'); +extractvalue('<a>A<b>B<c>C</c></b></a>','/a/descendant-or-self::*') +A B C select extractvalue('<A_B>A</A_B>','/A_B'); extractvalue('<A_B>A</A_B>','/A_B') A |