summaryrefslogtreecommitdiff
path: root/mysql-test/t/xml.test
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2014-04-23 17:43:20 +0400
committerAlexander Barkov <bar@mnogosearch.org>2014-04-23 17:43:20 +0400
commit64d33032a6b780a345418ebcab2edd5fb68bfe0d (patch)
treea0c46cfca9f921a8565489987abbb6a09266e297 /mysql-test/t/xml.test
parent2f93e7cf4766ee53d38343dbc46c12bdcc134601 (diff)
parenta24ea50d1a04d7bfe9608fe1ea8ac1ab8ed97294 (diff)
downloadmariadb-git-64d33032a6b780a345418ebcab2edd5fb68bfe0d.tar.gz
Merge 5.3->5.5
Diffstat (limited to 'mysql-test/t/xml.test')
-rw-r--r--mysql-test/t/xml.test14
1 files changed, 13 insertions, 1 deletions
diff --git a/mysql-test/t/xml.test b/mysql-test/t/xml.test
index 7013a306270..ec632eb90c3 100644
--- a/mysql-test/t/xml.test
+++ b/mysql-test/t/xml.test
@@ -53,7 +53,7 @@ SELECT extractValue(@xml,'/a//@x');
SELECT extractValue(@xml,'/a//@x[1]');
SELECT extractValue(@xml,'/a//@x[2]');
-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]');
SELECT extractValue(@xml,'/descendant::b[1]');
@@ -653,6 +653,18 @@ SELECT ExtractValue(CONVERT('<\"', BINARY(10)), 1);
--echo End of 5.1 tests
+--echo #
+--echo # Start of 5.3 tests
+--echo #
+
+--echo #
+--echo # MDEV-5338 XML parser accepts malformed data
+--echo #
+SELECT ExtractValue('<a>xxx</c>','/a/b');
+SELECT ExtractValue('<a><b>xxx</c></a>','/a/b');
+
+--echo #
+--echo # End of 5.3 tests
--echo #
--echo # Start of 5.5 tests