From 8822b30f1e258a5f0efc124043f42970e600c5d4 Mon Sep 17 00:00:00 2001
From: sjaakola <seppo.jaakola@iki.fi>
Date: Tue, 10 Oct 2017 23:39:48 +0300
Subject: MW-416 Replicating DDL after ACL check, 5.6 version

Re-implemented the fix for MW-416 according to 5.7 version
---
 sql/sql_trigger.cc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'sql/sql_trigger.cc')

diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index c562ee9762c..70ed6f0e600 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -501,6 +501,7 @@ 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);
@@ -605,6 +606,10 @@ end:
     my_ok(thd);
 
   DBUG_RETURN(result);
+#ifdef WITH_WSREP
+ error:
+  DBUG_RETURN(TRUE);
+#endif /* WITH_WSREP */
 }
 
 
-- 
cgit v1.2.1