database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.0-galera' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2018-09-07 15:25:27 +02:00
parent f95d26b4d3 2482306861
commit db947b7599
19 changed files with 580 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_trigger.cc
View File

@ -503,7 +503,11 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
if (err_status)
goto end;
}
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
#ifdef WITH_WSREP
if (thd->wsrep_exec_mode == LOCAL_STATE)
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
#endif
/* We should have only one table in table list. */
DBUG_ASSERT(tables->next_global == 0);