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 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-05-26 11:22:40 +03:00
parent 71e1ddda22 365cd08345
commit 860e754349
65 changed files with 1544 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_trigger.cc
View File

@ -1,6 +1,6 @@
/*
Copyright (c) 2004, 2012, Oracle and/or its affiliates.
Copyright (c) 2010, 2018, MariaDB
Copyright (c) 2010, 2021, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -483,7 +483,6 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
thd->variables.lock_wait_timeout))
goto end;
if (!create)
{
bool if_exists= thd->lex->if_exists();
@ -599,9 +598,8 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
table= tables->table;
#ifdef WITH_WSREP
if (WSREP(thd) &&
!wsrep_should_replicate_ddl(thd, table->s->db_type()))
goto wsrep_error_label;
if (WSREP(thd) && !wsrep_should_replicate_ddl(thd, table->s->db_type()))
goto end;
#endif
/* Later on we will need it to downgrade the lock */
@ -725,9 +723,11 @@ end:
thd->mdl_context.release_lock(mdl_request_for_trn.ticket);
DBUG_RETURN(result);
#ifdef WITH_WSREP
wsrep_error_label:
DBUG_RETURN(true);
DBUG_ASSERT(result == 1);
goto end;
#endif
drop_orphan_trn: