diff options
| author | unknown <sanja@askmonty.org> | 2009-12-08 23:47:54 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2009-12-08 23:47:54 +0200 |
| commit | 08e4635fbabb4a4bea3a9b44057a2cd9b12d580f (patch) | |
| tree | 9de56c7859229fc3e173370d434fb24e1a367a1d /sql/item_xmlfunc.cc | |
| parent | e4e1ae0d13da399d53bd91df791b149f3eae796b (diff) | |
| parent | 27f4f67bd2f35bf710f1a4e4ddde0e42738a195d (diff) | |
| download | mariadb-git-08e4635fbabb4a4bea3a9b44057a2cd9b12d580f.tar.gz | |
merge 5.1-> 5.2
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index f2e33dc2d44..15165a9c435 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -1363,8 +1363,7 @@ my_xpath_lex_scan(MY_XPATH *xpath, MY_XPATH_LEX *lex, const char *beg, const char *end) { int ch, ctype, length; - for ( ; beg < end && *beg == ' ' ; beg++) // skip leading spaces - ; + for ( ; beg < end && *beg == ' ' ; beg++) ; // skip leading spaces lex->beg= beg; if (beg >= end) @@ -1433,8 +1432,7 @@ my_xpath_lex_scan(MY_XPATH *xpath, if (my_xdigit(ch)) // a sequence of digits { - for ( ; beg < end && my_xdigit(*beg) ; beg++) - ; + for ( ; beg < end && my_xdigit(*beg) ; beg++) ; lex->end= beg; lex->term= MY_XPATH_LEX_DIGITS; return; @@ -1442,8 +1440,7 @@ my_xpath_lex_scan(MY_XPATH *xpath, if (ch == '"' || ch == '\'') // a string: either '...' or "..." { - for ( ; beg < end && *beg != ch ; beg++) - ; + for ( ; beg < end && *beg != ch ; beg++) ; if (beg < end) { lex->end= beg+1; |