Bug #18172 XML: Extractvalue() accepts mallformed

  XPath without a XPath syntax error
item_xmlfunc.cc:
  Error message didn't happen because after
  a failing attempt to parse RelativeLocationPath,
  my_xpath_parse_AbsoluteLocationPath() returned success.
  Changeing logic a bit:
  - Try to parse EOF first, return success if true.
  - Then try to parse RelativeLocationPath(), return success if true.
  - Otherwise return failure.
xml.result:
  Adding test case.
  Also, this change made it possible to generate 
  an error message earlier in the case of another
  bad XPATH syntax.
xml.test:
  Adding test case.

1 files changed, 4 insertions, 1 deletions

diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc
index da39c1e4409..8e5efa9f0f5 100644
--- a/sql/item_xmlfunc.cc
+++ b/sql/item_xmlfunc.cc
@@ -1561,10 +1561,13 @@ static int my_xpath_parse_AbsoluteLocationPath(MY_XPATH *xpath)
     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 1;
+  return 0;
 }