mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 14:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge host.loc:/home/uchum/work/5.0-opt-gca

Browse source 
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
This commit is contained in:
unknown 2008-02-13 19:37:05 +04:00
commit 22e2762640
6 changed files with 67 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_acl.cc
View file

@ -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;