bk commit into 5.1 tree (bar:1.2191) BUG#18172

[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.2191 06/03/22 12:57:41 bar@stripped +1 -0
  item_xmlfunc.cc:
    After review fix.
    Thanks to Gluh for suggestion.
    Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error

  sql/item_xmlfunc.cc
    1.11 06/03/22 12:55:25 bar@stripped +2 -7
    After review fix.
    Thanks to Gluh for suggestion.
    Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error

# 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.b18172

--- 1.10/sql/item_xmlfunc.cc	2006-03-20 14:51:01 +04:00
+++ 1.11/sql/item_xmlfunc.cc	2006-03-22 12:55:25 +04:00
@@ -1561,13 +1561,8 @@
     return my_xpath_parse_RelativeLocationPath(xpath);
   }
 
-  if (my_xpath_parse_term(xpath, MY_XPATH_LEX_EOF))
-    return 1;
-
-  if (my_xpath_parse_RelativeLocationPath(xpath))
-    return 1;
-
-  return 0;
+  return my_xpath_parse_term(xpath, MY_XPATH_LEX_EOF) ||
+         my_xpath_parse_RelativeLocationPath(xpath);
 }