diff options
| author | unknown <guilhem@mysql.com> | 2004-03-26 19:29:10 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-03-26 19:29:10 +0100 |
| commit | 266d36196dc92babd1e934b35573b957d89de56d (patch) | |
| tree | 22356aeceb59d761cbb94000d67c168c7524d2c9 /sql/set_var.cc | |
| parent | e320ade2efe0d91749dc3ebb812c8c1ded799499 (diff) | |
| parent | ab8c3d89b8c7c10ccf2b006ea279637e382909a1 (diff) | |
| download | mariadb-git-266d36196dc92babd1e934b35573b957d89de56d.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 8e39e1c275d..74c4fc74d8a 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2284,6 +2284,13 @@ static bool set_option_autocommit(THD *thd, set_var *var) static bool set_log_update(THD *thd, set_var *var) { +#ifndef NO_EMBEDDED_ACCESS_CHECKS + if (!(thd->master_access & SUPER_ACL)) + { + my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER"); + return 1; + } +#endif if (opt_sql_bin_update) ((sys_var_thd_bit*) var->var)->bit_flag|= (OPTION_BIN_LOG | OPTION_UPDATE_LOG); |