summaryrefslogtreecommitdiff
path: root/sql/sql_view.cc
diff options
context:
space:
mode:
authorsjaakola <seppo.jaakola@iki.fi>2017-10-10 23:39:48 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2017-10-19 09:57:23 +0300
commit8822b30f1e258a5f0efc124043f42970e600c5d4 (patch)
tree1fe8b9d5d6a10338211dc0b085da009a7fced496 /sql/sql_view.cc
parent38530c86aa36e2cbd315447a5362bcc751fb9205 (diff)
downloadmariadb-git-8822b30f1e258a5f0efc124043f42970e600c5d4.tar.gz
MW-416 Replicating DDL after ACL check, 5.6 version
Re-implemented the fix for MW-416 according to 5.7 version
Diffstat (limited to 'sql/sql_view.cc')
-rw-r--r--sql/sql_view.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 5bd82fdd842..f6948a76f6a 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -429,6 +429,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
if ((res= create_view_precheck(thd, tables, view, mode)))
goto err;
+ WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
lex->link_first_table_back(view, link_to_local);
view->open_type= OT_BASE_ONLY;
@@ -721,6 +722,10 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
lex->link_first_table_back(view, link_to_local);
DBUG_RETURN(0);
+#ifdef WITH_WSREP
+ error:
+ res= TRUE;
+#endif /* WITH_WSREP */
err:
thd_proc_info(thd, "end");
lex->link_first_table_back(view, link_to_local);