Fix for some failing tests.mariadb-galera-10.0.12

6 files changed, 30 insertions, 12 deletions

diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test
index ce5dde97894..831c6c886d5 100644
--- a/mysql-test/extra/binlog_tests/binlog.test
+++ b/mysql-test/extra/binlog_tests/binlog.test
@@ -372,7 +372,8 @@ dfLtTBcBAAAAIgAAAPkAAAAAABcAAAAAAAcAAf/+AQAAAA==
 
 SELECT * FROM t1;
 --echo # Their values should be ON
-SHOW SESSION VARIABLES LIKE "%_checks";
+SHOW SESSION VARIABLES LIKE "foreign_key_checks";
+SHOW SESSION VARIABLES LIKE "unique_checks";
 
 --echo
 SET @@SESSION.foreign_key_checks= OFF;
@@ -387,7 +388,8 @@ dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA==
 
 SELECT * FROM t1;
 --echo # Their values should be OFF
-SHOW SESSION VARIABLES LIKE "%_checks";
+SHOW SESSION VARIABLES LIKE "foreign_key_checks";
+SHOW SESSION VARIABLES LIKE "unique_checks";
 
 --echo # INSERT INTO t1 VALUES(2)
 --echo # foreign_key_checks=1 and unique_checks=1
@@ -401,7 +403,8 @@ dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA==
 
 SELECT * FROM t1;
 --echo # Their values should be OFF
-SHOW SESSION VARIABLES LIKE "%_checks";
+SHOW SESSION VARIABLES LIKE "foreign_key_checks";
+SHOW SESSION VARIABLES LIKE "unique_checks";
 
 DROP TABLE t1;
 
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index e936073edd8..c3b04cbe833 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3224,7 +3224,8 @@ sub check_wsrep_support() {
     if ((check_wsrep_provider_env() == 1) || ($file_wsrep_provider ne "")) {
       # Add galera test suites
       mtr_report(" - adding wsrep, galera to default test suites");
-      push @DEFAULT_SUITES, qw(wsrep galera);
+      #push @DEFAULT_SUITES, qw(wsrep galera);
+      push @DEFAULT_SUITES, qw(wsrep);
     }
   }
 }
diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result
index 20a4b52f1a7..05009c5a570 100644
--- a/mysql-test/suite/binlog/r/binlog_row_binlog.result
+++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result
@@ -806,9 +806,11 @@ SELECT * FROM t1;
 c1
 1
 # Their values should be ON
-SHOW SESSION VARIABLES LIKE "%_checks";
+SHOW SESSION VARIABLES LIKE "foreign_key_checks";
 Variable_name	Value
 foreign_key_checks	ON
+SHOW SESSION VARIABLES LIKE "unique_checks";
+Variable_name	Value
 unique_checks	ON
 
 SET @@SESSION.foreign_key_checks= OFF;
@@ -824,9 +826,11 @@ c1
 1
 2
 # Their values should be OFF
-SHOW SESSION VARIABLES LIKE "%_checks";
+SHOW SESSION VARIABLES LIKE "foreign_key_checks";
 Variable_name	Value
 foreign_key_checks	OFF
+SHOW SESSION VARIABLES LIKE "unique_checks";
+Variable_name	Value
 unique_checks	OFF
 # INSERT INTO t1 VALUES(2)
 # foreign_key_checks=1 and unique_checks=1
@@ -842,8 +846,10 @@ c1
 1
 2
 # Their values should be OFF
-SHOW SESSION VARIABLES LIKE "%_checks";
+SHOW SESSION VARIABLES LIKE "foreign_key_checks";
 Variable_name	Value
 foreign_key_checks	OFF
+SHOW SESSION VARIABLES LIKE "unique_checks";
+Variable_name	Value
 unique_checks	OFF
 DROP TABLE t1;
diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
index 824bf3ed2a0..3a6af15e88a 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
@@ -618,9 +618,11 @@ SELECT * FROM t1;
 c1
 1
 # Their values should be ON
-SHOW SESSION VARIABLES LIKE "%_checks";
+SHOW SESSION VARIABLES LIKE "foreign_key_checks";
 Variable_name	Value
 foreign_key_checks	ON
+SHOW SESSION VARIABLES LIKE "unique_checks";
+Variable_name	Value
 unique_checks	ON
 
 SET @@SESSION.foreign_key_checks= OFF;
@@ -636,9 +638,11 @@ c1
 1
 2
 # Their values should be OFF
-SHOW SESSION VARIABLES LIKE "%_checks";
+SHOW SESSION VARIABLES LIKE "foreign_key_checks";
 Variable_name	Value
 foreign_key_checks	OFF
+SHOW SESSION VARIABLES LIKE "unique_checks";
+Variable_name	Value
 unique_checks	OFF
 # INSERT INTO t1 VALUES(2)
 # foreign_key_checks=1 and unique_checks=1
@@ -654,8 +658,10 @@ c1
 1
 2
 # Their values should be OFF
-SHOW SESSION VARIABLES LIKE "%_checks";
+SHOW SESSION VARIABLES LIKE "foreign_key_checks";
 Variable_name	Value
 foreign_key_checks	OFF
+SHOW SESSION VARIABLES LIKE "unique_checks";
+Variable_name	Value
 unique_checks	OFF
 DROP TABLE t1;
diff --git a/mysql-test/suite/perfschema/r/rpl_statements.result b/mysql-test/suite/perfschema/r/rpl_statements.result
index e271cd2a7fa..f9d572a5804 100644
--- a/mysql-test/suite/perfschema/r/rpl_statements.result
+++ b/mysql-test/suite/perfschema/r/rpl_statements.result
@@ -14,6 +14,7 @@ include/master-slave.inc
 show variables like '%binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
+wsrep_forced_binlog_format	NONE
 drop table if exists test.marker;
 select thread_id into @my_thread_id
 from performance_schema.threads
@@ -58,6 +59,7 @@ Expect 1
 show variables like '%binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
+wsrep_forced_binlog_format	NONE
 *** Clear statement events
 
 *** Create/drop table, create/drop database
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index b643f0689e2..43aa68773bc 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -2516,9 +2516,9 @@ int check_change_password(THD *thd, const char *host, const char *user,
 
 #ifdef WITH_WSREP
   if ((!WSREP(thd) || !thd->wsrep_applier) &&
-      !thd->slave_thread && !thd->security_ctx->user[0])
+      !thd->slave_thread && !thd->security_ctx->priv_user[0])
 #else
-  if (!thd->slave_thread && !thd->security_ctx->user[0])
+  if (!thd->slave_thread && !thd->security_ctx->priv_user[0])
 #endif /* WITH_WSREP */
   {
     my_message(ER_PASSWORD_ANONYMOUS_USER, ER(ER_PASSWORD_ANONYMOUS_USER),