Fix Merge Error

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

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

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

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 

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

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))
     {