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/sql_trigger.cc | |
| parent | 91ba789aaf8feffb9ad377c740759b2359c5a094 (diff) | |
| download | mariadb-git-a1e330de5a37f88339f4a5b46231a41eb60f43d2.tar.gz | |
MDEV-21743 Split up SUPER privilege to smaller privileges
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index cb10d8ecb3b..5b8ae46d33f 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -30,7 +30,6 @@ #include "sql_table.h" // build_table_filename, // check_n_cut_mysql50_prefix #include "sql_db.h" // get_default_db_collation -#include "sql_acl.h" // *_ACL #include "sql_handler.h" // mysql_ha_rm_tables #include "sp_cache.h" // sp_invalidate_cache #include <mysys_err.h> @@ -441,7 +440,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) */ if (!trust_function_creators && (WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open()) && - !(thd->security_ctx->master_access & SUPER_ACL)) + !(thd->security_ctx->master_access & PRIV_LOG_BIN_TRUSTED_SP_CREATOR)) { my_error(ER_BINLOG_CREATE_ROUTINE_NEED_SUPER, MYF(0)); DBUG_RETURN(TRUE); @@ -464,7 +463,8 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) */ thd->lex->sql_command= backup.sql_command; - if (opt_readonly && !(thd->security_ctx->master_access & SUPER_ACL) && + if (opt_readonly && + !(thd->security_ctx->master_access & PRIV_IGNORE_READ_ONLY) && !thd->slave_thread) { my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--read-only"); |