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

5.5 merge

This commit is contained in:
Sergei Golubchik
2013-03-27 23:41:02 +01:00
627 changed files with 17021 additions and 18027 deletions

View File

@ -3152,8 +3152,8 @@ int fill_schema_user_stats(THD* thd, TABLE_LIST* tables, COND* cond)
int result;
DBUG_ENTER("fill_schema_user_stats");
if (check_global_access(thd, SUPER_ACL | PROCESS_ACL))
DBUG_RETURN(1);
if (check_global_access(thd, SUPER_ACL | PROCESS_ACL, true))
DBUG_RETURN(0);
/*
Iterates through all the global stats and sends them to the client.
@ -3187,8 +3187,8 @@ int fill_schema_client_stats(THD* thd, TABLE_LIST* tables, COND* cond)
int result;
DBUG_ENTER("fill_schema_client_stats");
if (check_global_access(thd, SUPER_ACL | PROCESS_ACL))
DBUG_RETURN(1);
if (check_global_access(thd, SUPER_ACL | PROCESS_ACL, true))
DBUG_RETURN(0);
/*
Iterates through all the global stats and sends them to the client.