diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-04-23 17:43:20 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-04-23 17:43:20 +0400 |
| commit | 64d33032a6b780a345418ebcab2edd5fb68bfe0d (patch) | |
| tree | a0c46cfca9f921a8565489987abbb6a09266e297 /mysql-test/r/xml.result | |
| parent | 2f93e7cf4766ee53d38343dbc46c12bdcc134601 (diff) | |
| parent | a24ea50d1a04d7bfe9608fe1ea8ac1ab8ed97294 (diff) | |
| download | mariadb-git-64d33032a6b780a345418ebcab2edd5fb68bfe0d.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'mysql-test/r/xml.result')
| -rw-r--r-- | mysql-test/r/xml.result | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/mysql-test/r/xml.result b/mysql-test/r/xml.result index 6c78e9eac55..056ea62ee97 100644 --- a/mysql-test/r/xml.result +++ b/mysql-test/r/xml.result @@ -132,7 +132,7 @@ xb1 xc1 SELECT extractValue(@xml,'/a//@x[2]'); extractValue(@xml,'/a//@x[2]') xb2 xc2 -SET @xml='<a><b>b1</b><b>b2</b><c><b>c1b1</b><b>c1b2</b></c><c><b>c2b1</c></b></a>'; +SET @xml='<a><b>b1</b><b>b2</b><c><b>c1b1</b><b>c1b2</b></c><c><b>c2b1</b></c></a>'; SELECT extractValue(@xml,'//b[1]'); extractValue(@xml,'//b[1]') b1 c1b1 c2b1 @@ -1134,6 +1134,24 @@ Warnings: Warning 1525 Incorrect XML value: 'parse error at line 1 pos 11: STRING unexpected (ident or '/' wanted)' End of 5.1 tests # +# Start of 5.3 tests +# +# +# MDEV-5338 XML parser accepts malformed data +# +SELECT ExtractValue('<a>xxx</c>','/a/b'); +ExtractValue('<a>xxx</c>','/a/b') +NULL +Warnings: +Warning 1525 Incorrect XML value: 'parse error at line 1 pos 10: '</c>' unexpected ('</a>' wanted)' +SELECT ExtractValue('<a><b>xxx</c></a>','/a/b'); +ExtractValue('<a><b>xxx</c></a>','/a/b') +NULL +Warnings: +Warning 1525 Incorrect XML value: 'parse error at line 1 pos 13: '</c>' unexpected ('</b>' wanted)' +# +# End of 5.3 tests +# # Start of 5.5 tests # # |