diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-05-25 10:18:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-05-25 10:18:07 +0200 |
| commit | c2b9d993e33ac5099dfbde775af95e1400f40e87 (patch) | |
| tree | 36fce8869bf6a02a33db9c0f630eb401de77b101 /sql/sql_trigger.cc | |
| parent | a85186d7ab1b46bea7379e1e45fedeb193cfbcc4 (diff) | |
| parent | 1016ee9d77e8c9cd6e9bd114b808fff66f398255 (diff) | |
| download | mariadb-git-c2b9d993e33ac5099dfbde775af95e1400f40e87.tar.gz | |
Merge branch '10.1' of bzr::/usr/home/serg/Abk/mysql into 10.1
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 395b4ef894b..70ac6265046 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -458,6 +458,13 @@ 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) && + !thd->slave_thread) + { + my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--read-only"); + goto end; + } + if (add_table_for_trigger(thd, thd->lex->spname, if_exists, & tables)) goto end; |