diff options
| author | unknown <bar@mysql.com> | 2006-03-22 13:01:16 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-03-22 13:01:16 +0400 |
| commit | 187ff695092a300880c33f7acc0f384208d5c6b0 (patch) | |
| tree | faa44312b93c4b3cf1426847032ffa02b14a9459 /sql | |
| parent | 0cfbdc4e00dfcd6aad0d1510c55a38c9c0818999 (diff) | |
| parent | 64dc3289de27a26872f77070b693f52c88a9c36b (diff) | |
| download | mariadb-git-187ff695092a300880c33f7acc0f384208d5c6b0.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/home/bar/mysql-5.1-new.b18172
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_xmlfunc.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index da39c1e4409..ae626b7c368 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -1561,10 +1561,8 @@ static int my_xpath_parse_AbsoluteLocationPath(MY_XPATH *xpath) return my_xpath_parse_RelativeLocationPath(xpath); } - if (my_xpath_parse_RelativeLocationPath(xpath)) - return 1; - - return 1; + return my_xpath_parse_term(xpath, MY_XPATH_LEX_EOF) || + my_xpath_parse_RelativeLocationPath(xpath); } |