diff options
| author | unknown <gshchepa/uchum@host.loc> | 2008-02-13 19:37:05 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@host.loc> | 2008-02-13 19:37:05 +0400 |
| commit | 22e2762640a401a71604c2fdb1a3a3454b79de80 (patch) | |
| tree | d93b2a137a6235824590b1871d219fee4827c6f6 /sql/sql_acl.cc | |
| parent | 7a43d720245d1d9999ebf7d064063ed873eea60d (diff) | |
| parent | 7a290b55f7691b2518cb1d83da252e07376954f6 (diff) | |
| download | mariadb-git-22e2762640a401a71604c2fdb1a3a3454b79de80.tar.gz | |
Merge host.loc:/home/uchum/work/5.0-opt-gca
into host.loc:/home/uchum/work/5.1-opt-gca
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index d2d26da229a..064aa6dc044 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -801,7 +801,9 @@ static ulong get_sort(uint count,...) { for (; *str ; str++) { - if (*str == wild_many || *str == wild_one || *str == wild_prefix) + if (*str == wild_prefix && str[1]) + str++; + else if (*str == wild_many || *str == wild_one) { wild_pos= (uint) (str - start) + 1; break; |