revision-id: bc59bf686560374585ac9142bda733b90a82ae16 (mariadb-10.1.33-12-gbc59bf68656) parent(s): a64a8226851fbad856d14cf91e8a1ea1159ddfd9 author: Jan Lindström committer: Jan Lindström timestamp: 2018-05-14 15:29:13 +0300 message: Fix merge error. --- mysql-test/suite/sys_vars/r/sysvars_wsrep.result | 2 +- sql/sql_trigger.cc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index db932ae8223..a9268a2e8f0 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -610,7 +610,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Ensure "synchronous" read view before executing an operation of the type specified by bitmask: 1 - READ(includes SELECT, SHOW and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - INSERT and REPLACE +VARIABLE_COMMENT Ensure "synchronous" read view before executing an operation of the type specified by bitmask: 1 - READ(includes SELECT and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - INSERT and REPLACE; 8 - SHOW NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 15 NUMERIC_BLOCK_SIZE 1 diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 583c11ff4ee..e14d19c7369 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -504,7 +504,6 @@ 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); /* We should have only one table in table list. */ DBUG_ASSERT(tables->next_global == 0);