mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Bug#27145 EXTRA_ACL troubles
Correction of backport patch: * Fixed signature of check_access_table() for embedded build * Fixed typo for last argument in a check_access() call from UINT_MAX to 0.
This commit is contained in:
@@ -1064,9 +1064,9 @@ inline bool check_access(THD *thd, ulong access, const char *db,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
inline bool check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables,
|
inline bool check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables,
|
||||||
bool no_errors,
|
|
||||||
bool any_combination_of_privileges_will_do,
|
bool any_combination_of_privileges_will_do,
|
||||||
uint number)
|
uint number,
|
||||||
|
bool no_errors)
|
||||||
{ return false; }
|
{ return false; }
|
||||||
#endif /*NO_EMBEDDED_ACCESS_CHECKS*/
|
#endif /*NO_EMBEDDED_ACCESS_CHECKS*/
|
||||||
|
|
||||||
|
@@ -2268,7 +2268,7 @@ mysql_execute_command(THD *thd)
|
|||||||
privileges_requested,
|
privileges_requested,
|
||||||
all_tables, FALSE, UINT_MAX, FALSE);
|
all_tables, FALSE, UINT_MAX, FALSE);
|
||||||
else
|
else
|
||||||
res= check_access(thd, privileges_requested, any_db, 0, 0, 0, UINT_MAX);
|
res= check_access(thd, privileges_requested, any_db, 0, 0, 0, 0);
|
||||||
|
|
||||||
if (res)
|
if (res)
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user