bk commit into 5.1 tree (gluh:1.2210) 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.2210 06/03/01 10:36:22 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.5 06/03/01 10:36:15 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.5 06/03/01 10:36:15 gluh@stripped +5 -0
    Bug#16320 XML: extractvalue() won't accept names containing underscores
      test case

  mysql-test/r/xml.result
    1.5 06/03/01 10:36:15 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.17568

--- 1.4/mysql-test/r/xml.result	Tue Feb 28 13:57:40 2006
+++ 1.5/mysql-test/r/xml.result	Wed Mar  1 10:36:15 2006
@@ -546,3 +546,6 @@ 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: '!'
+select extractvalue('<A_B>A</A_B>','/A_B');
+extractvalue('<A_B>A</A_B>','/A_B')
+A

--- 1.4/mysql-test/t/xml.test	Tue Feb 28 13:57:34 2006
+++ 1.5/mysql-test/t/xml.test	Wed Mar  1 10:36:15 2006
@@ -243,3 +243,8 @@ select extractvalue('<a>A</a>','/<a>');
 #
 --error 1105
 select extractvalue('<a><b>b</b><b!>b!</b!></a>','//b!');
+
+#
+# Bug #16320 XML: extractvalue() won't accept names containing underscores
+#
+select extractvalue('<A_B>A</A_B>','/A_B');

--- 1.4/sql/item_xmlfunc.cc	Tue Feb 28 13:53:58 2006
+++ 1.5/sql/item_xmlfunc.cc	Wed Mar  1 10:36:15 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) == '_'));
 }