diff options
| author | unknown <guilhem@mysql.com> | 2004-03-26 19:25:22 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-03-26 19:25:22 +0100 |
| commit | ab8c3d89b8c7c10ccf2b006ea279637e382909a1 (patch) | |
| tree | d2669c9c03a864d659be52cf9badd23f11b884f1 /sql/sql_insert.cc | |
| parent | 11bea84e431101c03ed0f0ccdc57815dd1359d77 (diff) | |
| download | mariadb-git-ab8c3d89b8c7c10ccf2b006ea279637e382909a1.tar.gz | |
Changing SET SQL_LOG_BIN so that it explicitely throws an error if
user is not SUPER, instead of setting the value but ignoring it
silently internally.
mysql-test/r/rpl_temporary.result:
result update
mysql-test/t/rpl_temporary.test:
adding test for privileges for SET SQL_LOG_BIN
sql/log.cc:
don't need to check SUPER
sql/set_var.cc:
refuse SET SQL_LOG_BIN if not SUPER
sql/sql_insert.cc:
Don't need to check SUPER
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index a9b947505f0..f463c6a27ff 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -134,15 +134,10 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, thd->lex->select_lex.table_list.first; DBUG_ENTER("mysql_insert"); -#ifndef NO_EMBEDDED_ACCESS_CHECKS - if (thd->master_access & SUPER_ACL) -#endif - { - if (!(thd->options & OPTION_UPDATE_LOG)) - log_on&= ~(int) DELAYED_LOG_UPDATE; - if (!(thd->options & OPTION_BIN_LOG)) - log_on&= ~(int) DELAYED_LOG_BIN; - } + if (!(thd->options & OPTION_UPDATE_LOG)) + log_on&= ~(int) DELAYED_LOG_UPDATE; + if (!(thd->options & OPTION_BIN_LOG)) + log_on&= ~(int) DELAYED_LOG_BIN; /* in safe mode or with skip-new change delayed insert to be regular if we are told to replace duplicates, the insert cannot be concurrent |