summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2006-02-28 17:29:49 +0400
committerunknown <bar@mysql.com>2006-02-28 17:29:49 +0400
commit7f7c624656840767e601b9f156cfeae109ca5b37 (patch)
tree812d589f50ca8cf851e035a48d27f7e2e567783f /mysql-test
parent50ce511bdb415f2078b6853e09d198af00fdba4b (diff)
parent828de833bf3d981a28c94346121d99ef6efb30b4 (diff)
downloadmariadb-git-7f7c624656840767e601b9f156cfeae109ca5b37.tar.gz
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/home/bar/mysql-5.1-new.16313
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/xml.result2
-rw-r--r--mysql-test/t/xml.test6
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/xml.result b/mysql-test/r/xml.result
index b4121ae473d..3ed3df546d1 100644
--- a/mysql-test/r/xml.result
+++ b/mysql-test/r/xml.result
@@ -544,3 +544,5 @@ extractvalue('<a>a<b>B</b></a>','a|/b')
a
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: '!'
diff --git a/mysql-test/t/xml.test b/mysql-test/t/xml.test
index 0e24692f0fa..e69ab5ee58b 100644
--- a/mysql-test/t/xml.test
+++ b/mysql-test/t/xml.test
@@ -237,3 +237,9 @@ select extractvalue('<a>a<b>B</b></a>','a|/b');
#
--error 1105
select extractvalue('<a>A</a>','/<a>');
+
+#
+# Bug#16313 XML: extractvalue() ignores '!' in names
+#
+--error 1105
+select extractvalue('<a><b>b</b><b!>b!</b!></a>','//b!');