database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.

Browse Source
This commit is contained in:
Jan Lindström
2014-04-16 12:13:43 +03:00
parent 983366e0ee 142c20eda9
commit 150e88e8c9
2006 changed files with 137005 additions and 122130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_trigger.cc
View File

@ -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;