diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-19 15:25:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-19 15:25:58 +0100 |
| commit | e73f13a707a2bc8e19c7c1424342eec7545797ae (patch) | |
| tree | d2b00407e01c05c3b206ba97014bb1f80bd351dc /sql/sql_show.cc | |
| parent | db65e4f537c8774b0f6fe92a08cd28905f7b65a9 (diff) | |
| download | mariadb-git-e73f13a707a2bc8e19c7c1424342eec7545797ae.tar.gz | |
extend check_global_access() to avoid my_error when it's not needed
(in INFORMATION_SCHEMA).
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index cb96db0a46d..e4b83a68a68 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2920,8 +2920,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. @@ -2955,8 +2955,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. |