database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

A fix (Bug#4898: User privileges depending on ORDER BY Settings of table db)

Browse Source
This commit is contained in:
unknown
2004-08-12 09:41:35 +05:00
parent 3603196b19
commit bb10ca26ec
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_acl.cc
View File

@ -460,22 +460,30 @@ static ulong get_sort(uint count,...)
va_start(args,count); va_start(args,count);
ulong sort=0; ulong sort=0;
/* Should not use this function with more than 4 arguments for compare. */
DBUG_ASSERT(count <= 4);
while (count--) while (count--)
{ {
char *str=va_arg(args,char*); char *start, *str= va_arg(args,char*);
uint chars=0,wild=0; uint chars= 0;
uint wild_pos= 0; /* first wildcard position */
if (str) if (start= str)
{ {
for (; *str ; str++) for (; *str ; str++)
{ {
if (*str == wild_many || *str == wild_one || *str == wild_prefix) if (*str == wild_many || *str == wild_one || *str == wild_prefix)
wild++; {
wild_pos= str - start + 1;
break;
}
else else
chars++; chars++;
} }
} }
sort= (sort << 8) + (wild ? 1 : chars ? 2 : 0); sort= (sort << 8) + (wild_pos ? (wild_pos > 127 ? 127 : wild_pos) :
(chars ? 128 : 0));
} }
va_end(args); va_end(args);
return sort; return sort;