bk commit into 5.1 tree (bar:1.2184) BUG#16312

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2184 06/02/27 11:21:20 bar@stripped +2 -0
  xml.test:
  xml.result:
    Adding test for Bug #16312 XML: extractvalue() crash if angle brackets,
    A fix for #16234 fixed this bug automatically.

  mysql-test/r/xml.result
    1.3 06/02/27 11:20:34 bar@stripped +2 -0

  mysql-test/t/xml.test
    1.3 06/02/27 11:18:47 bar@stripped +6 -0
    Adding test for Bug #16312 XML: extractvalue() crash if angle brackets,
    A fix for #16234 fixed this bug automatically.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1-new

--- 1.2/mysql-test/r/xml.result	2006-02-10 13:22:52 +04:00
+++ 1.3/mysql-test/r/xml.result	2006-02-27 11:20:34 +04:00
@@ -542,3 +542,5 @@
 select extractvalue('<a>a<b>B</b></a>','a|/b');
 extractvalue('<a>a<b>B</b></a>','a|/b')
 a
+select extractvalue('<a>A</a>','/<a>');
+ERROR HY000: XPATH syntax error: '>'

--- 1.2/mysql-test/t/xml.test	2006-02-10 13:22:41 +04:00
+++ 1.3/mysql-test/t/xml.test	2006-02-27 11:18:47 +04:00
@@ -231,3 +231,9 @@
 select extractvalue('<a>a<b>B</b></a>','/a|/b');
 select extractvalue('<a>a<b>B</b></a>','/a|b');
 select extractvalue('<a>a<b>B</b></a>','a|/b');
+
+#
+# Bug#16312 XML: extractvalue() crash if angle brackets
+#
+--error 1105
+select extractvalue('<a>A</a>','/<a>');