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

extend check_global_access() to avoid my_error when it's not needed

Browse source 
(in INFORMATION_SCHEMA).
This commit is contained in:
Sergei Golubchik 2013-03-19 15:25:58 +01:00
commit e73f13a707
6 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

46
storage/xtradb/handler/i_s.cc
View file

@ -1210,7 +1210,7 @@ trx_i_s_common_fill_table(
DBUG_ENTER("trx_i_s_common_fill_table");
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -1370,7 +1370,7 @@ i_s_cmp_fill_low(
DBUG_ENTER("i_s_cmp_fill_low");
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -1642,7 +1642,7 @@ i_s_cmpmem_fill_low(
DBUG_ENTER("i_s_cmpmem_fill_low");
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -2275,7 +2275,7 @@ i_s_innodb_buffer_stats_fill_table(
DBUG_ENTER("i_s_innodb_buffer_fill_general");
/* Only allow the PROCESS privilege holder to access the stats */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -2968,7 +2968,7 @@ i_s_innodb_buffer_page_fill_table(
DBUG_ENTER("i_s_innodb_buffer_page_fill_table");
/* deny access to user without PROCESS privilege */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -3513,7 +3513,7 @@ i_s_innodb_buf_page_lru_fill_table(
DBUG_ENTER("i_s_innodb_buf_page_lru_fill_table");
/* deny access to any users that do not hold PROCESS_ACL */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -3747,7 +3747,7 @@ i_s_sys_tables_fill_table(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -4050,7 +4050,7 @@ i_s_sys_tables_fill_table_stats(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -4294,7 +4294,7 @@ i_s_sys_indexes_fill_table(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -4531,7 +4531,7 @@ i_s_sys_columns_fill_table(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -4733,7 +4733,7 @@ i_s_sys_fields_fill_table(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -4962,7 +4962,7 @@ i_s_sys_foreign_fill_table(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -5173,7 +5173,7 @@ i_s_sys_foreign_cols_fill_table(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -5388,7 +5388,7 @@ i_s_sys_stats_fill_table(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -5574,7 +5574,7 @@ i_s_innodb_rseg_fill(
DBUG_ENTER("i_s_innodb_rseg_fill");
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -5798,7 +5798,7 @@ i_s_innodb_table_stats_fill(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -5863,7 +5863,7 @@ i_s_innodb_index_stats_fill(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -6055,7 +6055,7 @@ i_s_innodb_admin_command_fill(
RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -6432,7 +6432,7 @@ i_s_innodb_buffer_pool_pages_fill(
DBUG_ENTER("i_s_innodb_buffer_pool_pages_fill");
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -6537,7 +6537,7 @@ i_s_innodb_buffer_pool_pages_index_fill(
DBUG_ENTER("i_s_innodb_buffer_pool_pages_index_fill");
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -6606,7 +6606,7 @@ i_s_innodb_buffer_pool_pages_blob_fill(
DBUG_ENTER("i_s_innodb_buffer_pool_pages_blob_fill");
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -7010,7 +7010,7 @@ i_s_innodb_undo_logs_fill(
DBUG_ENTER("i_s_innodb_undo_logs_fill");
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}
@ -7336,7 +7336,7 @@ i_s_innodb_changed_pages_fill(
DBUG_ENTER("i_s_innodb_changed_pages_fill");
/* deny access to non-superusers */
if (check_global_access(thd, PROCESS_ACL)) {
if (check_global_access(thd, PROCESS_ACL, true)) {
DBUG_RETURN(0);
}