diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-07-25 18:46:43 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-07-25 18:46:43 +0500 |
| commit | 6530968211e033bde1ee8a9f2d04fdcc8e1097aa (patch) | |
| tree | a11f580ec6f0a86b1bb2928dddf266337448a607 /sql/item_xmlfunc.cc | |
| parent | 7b2cabd902d3b6c669bd8a0302aaf8b7568cad06 (diff) | |
| download | mariadb-git-6530968211e033bde1ee8a9f2d04fdcc8e1097aa.tar.gz | |
Bug#20795: extractvalue() won't accept names containing a dot (.)
Dot character was not considered as a valid identifier body character.
mysql-test/r/xml.result:
Adding test case
mysql-test/t/xml.test:
Adding test case
sql/item_xmlfunc.cc:
Treat dot character as a valid identifier body part.
strings/ctype.c:
Fixing to use '/' instead of '.' as a delimiter in charset file parser.
strings/xml.c:
Fixing to use '/' instead of '.' as a delimiter.
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index ed4b81c897f..dfa2d2a7325 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -1356,7 +1356,8 @@ my_xpath_lex_scan(MY_XPATH *xpath, (length= xpath->cs->cset->ctype(xpath->cs, &ctype, (const uchar*) beg, (const uchar*) end)) > 0 && - ((ctype & (_MY_L | _MY_U | _MY_NMR)) || *beg == '_' || *beg == '-') ; + ((ctype & (_MY_L | _MY_U | _MY_NMR)) || + *beg == '_' || *beg == '-' || *beg == '.') ; beg+= length) /* no op */; lex->end= beg; |