1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

mysql-5.5.37 selective merge

This commit is contained in:
Sergei Golubchik
2014-03-27 22:26:58 +01:00
1335 changed files with 3710 additions and 722 deletions

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;