Bug#16319: XML: extractvalue() returns syntax errors for some functions

mysql-test/r/xml.result:
  Adding test case
mysql-test/t/xml.test:
  Adding test case
sql/item_xmlfunc.cc:
  Adding support for missing XPath function string-length().
  Fixing function lookup to allow functions with one optional arguments
  (i.e. with 0 or 1 arguments)

1 files changed, 14 insertions, 0 deletions

diff --git a/mysql-test/t/xml.test b/mysql-test/t/xml.test
index af3ec2d827e..cadbdcb0bb8 100644
--- a/mysql-test/t/xml.test
+++ b/mysql-test/t/xml.test
@@ -192,6 +192,20 @@ select extractValue(@xml, '/a/@b[substring(.,1,1)="2"]');
 select extractValue(@xml, '/a/@b[substring(.,2,1)="1"]');
 select extractValue(@xml, '/a/@b[substring(.,2,1)="2"]');
 
+#
+# Bug#16319: XML: extractvalue() returns syntax errors for some functions
+#
+SET @xml='<a><b>b1</b><b>b2</b></a>';
+SELECT extractValue(@xml, '/a/b[string-length("x")=1]');
+SELECT extractValue(@xml, '/a/b[string-length("xx")=2]');
+SELECT extractValue(@xml, '/a/b[string-length("xxx")=2]');
+SELECT extractValue(@xml, '/a/b[string-length("x")]');
+SELECT extractValue(@xml, '/a/b[string-length("xx")]');
+SELECT extractValue(@xml, '/a/b[string-length()]');
+--error 1105
+SELECT extractValue(@xml, 'string-length()');
+SELECT extractValue(@xml, 'string-length("x")');
+
 SET @xml='<a b="b11" b="b12" b="b21" b="22"/>';
 select extractValue(@xml,'/a/@b');
 select extractValue(@xml,'/a/@b[contains(.,"1")]');