bk commit into 5.1 tree (gluh:1.2190) BUG#16320

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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.2190 06/02/28 19:01:06 gluh@stripped +3 -0
  Bug#16320 XML: extractvalue() won't accept names containing underscores
    added '_' to allowed tag body symbols

  sql/item_xmlfunc.cc
    1.4 06/02/28 19:01:00 gluh@stripped +1 -1
    Bug#16320 XML: extractvalue() won't accept names containing underscores
      added '_' to allowed tag body symbols

  mysql-test/t/xml.test
    1.4 06/02/28 19:01:00 gluh@stripped +5 -0
    Bug#16320 XML: extractvalue() won't accept names containing underscores
     test case

  mysql-test/r/xml.result
    1.4 06/02/28 19:01:00 gluh@stripped +3 -0
    Bug#16320 XML: extractvalue() won't accept names containing underscores
      test case

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/5.1.17129

--- 1.3/mysql-test/r/xml.result	Mon Feb 27 11:20:34 2006
+++ 1.4/mysql-test/r/xml.result	Tue Feb 28 19:01:00 2006
@@ -544,3 +544,6 @@ 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>A</A_B>','/A_B');
+extractvalue('<A_B>A</A_B>','/A_B')
+A

--- 1.3/mysql-test/t/xml.test	Mon Feb 27 11:18:47 2006
+++ 1.4/mysql-test/t/xml.test	Tue Feb 28 19:01:00 2006
@@ -237,3 +237,8 @@ select extractvalue('<a>a<b>B</b></a>','
 #
 --error 1105
 select extractvalue('<a>A</a>','/<a>');
+
+#
+# Bug #16320 XML: extractvalue() won't accept names containing underscores
+#
+select extractvalue('<A_B>A</A_B>','/A_B');

--- 1.3/sql/item_xmlfunc.cc	Fri Feb 10 13:20:43 2006
+++ 1.4/sql/item_xmlfunc.cc	Tue Feb 28 19:01:00 2006
@@ -1272,7 +1272,7 @@ my_xident_body(int c)
   return (((c) >= 'a' && (c) <= 'z') ||
           ((c) >= 'A' && (c) <= 'Z') ||
           ((c) >= '0' && (c) <= '9') ||
-          ((c)=='-'));
+          ((c)=='-') || ((c) == '_'));
 }