diff options
| author | Alexander Barkov <bar@mariadb.com> | 2020-02-28 21:59:01 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2020-03-10 23:49:47 +0400 |
| commit | a1e330de5a37f88339f4a5b46231a41eb60f43d2 (patch) | |
| tree | a1ce4b2187f728dcf94478562c8ea272608cb911 /sql/set_var.cc | |
| parent | 91ba789aaf8feffb9ad377c740759b2359c5a094 (diff) | |
| download | mariadb-git-a1e330de5a37f88339f4a5b46231a41eb60f43d2.tar.gz | |
MDEV-21743 Split up SUPER privilege to smaller privileges
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index df52d42f54a..551b92012d1 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -33,7 +33,6 @@ // date_time_format_make #include "derror.h" #include "tztime.h" // my_tz_find, my_tz_SYSTEM, struct Time_zone -#include "sql_acl.h" // SUPER_ACL #include "sql_select.h" // free_underlaid_joins #include "sql_i_s.h" #include "sql_view.h" // updatable_views_with_limit_typelib @@ -788,7 +787,8 @@ int set_var::check(THD *thd) my_error(err, MYF(0), var->name.str); return -1; } - if ((type == OPT_GLOBAL && check_global_access(thd, SUPER_ACL))) + if (type == OPT_GLOBAL && + check_global_access(thd, PRIV_SET_GLOBAL_SYSTEM_VARIABLE)) return 1; /* value is a NULL pointer if we are using SET ... = DEFAULT */ if (!value) @@ -825,7 +825,8 @@ int set_var::light_check(THD *thd) my_error(err, MYF(0), var->name.str); return -1; } - if (type == OPT_GLOBAL && check_global_access(thd, SUPER_ACL)) + if (type == OPT_GLOBAL && + check_global_access(thd, PRIV_SET_GLOBAL_SYSTEM_VARIABLE)) return 1; if (value && value->fix_fields_if_needed_for_scalar(thd, &value)) |