From 5077cc0b1a0d82c55ce6b6ec643f04099d0e8416 Mon Sep 17 00:00:00 2001
From: Sachin Setiya <sachin.setiya@mariadb.com>
Date: Wed, 23 Aug 2017 16:49:42 +0530
Subject: [PATCH] Fix Merge Error

---
 mysql-test/include/wait_wsrep_ready.inc          | 5 ++++-
 mysql-test/suite/sys_vars/r/sysvars_wsrep.result | 2 +-
 mysql-test/suite/wsrep/t/mdev_6832.opt           | 2 +-
 mysql-test/suite/wsrep/t/mdev_7798.opt           | 2 +-
 plugin/wsrep_info/mysql-test/wsrep_info/my.cnf   | 2 --
 sql/sql_parse.cc                                 | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mysql-test/include/wait_wsrep_ready.inc b/mysql-test/include/wait_wsrep_ready.inc
index 0e666afa33d..2dd1ef7f1ab 100644
--- a/mysql-test/include/wait_wsrep_ready.inc
+++ b/mysql-test/include/wait_wsrep_ready.inc
@@ -8,7 +8,10 @@
 
 if (`SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'wsrep' AND PLUGIN_STATUS='ACTIVE'`)
 {
-  --source include/galera_wait_ready.inc
+  if (`SELECT @@GLOBAL.WSREP_ON`)
+  {
+    --source include/galera_wait_ready.inc
+  }
 }
 
 --enable_query_log
diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
index 69df8c0f19e..0c206975c29 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
@@ -598,7 +598,7 @@ 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
 NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	7
+NUMERIC_MAX_VALUE	15
 NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
diff --git a/mysql-test/suite/wsrep/t/mdev_6832.opt b/mysql-test/suite/wsrep/t/mdev_6832.opt
index 459a9702707..16f8962dba2 100644
--- a/mysql-test/suite/wsrep/t/mdev_6832.opt
+++ b/mysql-test/suite/wsrep/t/mdev_6832.opt
@@ -1 +1 @@
---wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1 --wsrep_causal_reads=ON
+--wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1
diff --git a/mysql-test/suite/wsrep/t/mdev_7798.opt b/mysql-test/suite/wsrep/t/mdev_7798.opt
index 459a9702707..1007d5c0b78 100644
--- a/mysql-test/suite/wsrep/t/mdev_7798.opt
+++ b/mysql-test/suite/wsrep/t/mdev_7798.opt
@@ -1 +1 @@
---wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1 --wsrep_causal_reads=ON
+--wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1 
diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
index 4af933f1633..70682178ca1 100644
--- a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
+++ b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
@@ -8,8 +8,6 @@ innodb-autoinc-lock-mode=2
 innodb-locks-unsafe-for-binlog=1
 wsrep-cluster-address=gcomm://
 wsrep_provider=@ENV.WSREP_PROVIDER
-# enforce read-committed characteristics across the cluster
-wsrep_causal_reads=ON
 
 [mysqld.1]
 #galera_port=@OPT.port
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index f5721d2ca2f..6f9e4677c0b 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -4225,7 +4225,7 @@ end_with_restore_list:
     */
     if (thd->slave_thread && !thd->slave_expected_error &&
         slave_ddl_exec_mode_options == SLAVE_EXEC_MODE_IDEMPOTENT)
-      lex->check_exists= 1;
+      lex->create_info.set(DDL_options_st::OPT_IF_EXISTS);
 
     if (WSREP(thd))
     {