Skip to content

Commit 7ed27e1

Browse files
author
Nirbhay Choubey
committed
Fix for some failing tests.
1 parent 9e1075e commit 7ed27e1

File tree

6 files changed

+30
-12
lines changed

6 files changed

+30
-12
lines changed

‎mysql-test/extra/binlog_tests/binlog.test

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,8 @@ dfLtTBcBAAAAIgAAAPkAAAAAABcAAAAAAAcAAf/+AQAAAA==
372372

373373
SELECT * FROM t1;
374374
--echo # Their values should be ON
375-
SHOW SESSION VARIABLES LIKE "%_checks";
375+
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
376+
SHOW SESSION VARIABLES LIKE "unique_checks";
376377

377378
--echo
378379
SET @@SESSION.foreign_key_checks= OFF;
@@ -387,7 +388,8 @@ dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA==
387388

388389
SELECT * FROM t1;
389390
--echo # Their values should be OFF
390-
SHOW SESSION VARIABLES LIKE "%_checks";
391+
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
392+
SHOW SESSION VARIABLES LIKE "unique_checks";
391393

392394
--echo # INSERT INTO t1 VALUES(2)
393395
--echo # foreign_key_checks=1 and unique_checks=1
@@ -401,7 +403,8 @@ dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA==
401403

402404
SELECT * FROM t1;
403405
--echo # Their values should be OFF
404-
SHOW SESSION VARIABLES LIKE "%_checks";
406+
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
407+
SHOW SESSION VARIABLES LIKE "unique_checks";
405408

406409
DROP TABLE t1;
407410

‎mysql-test/mysql-test-run.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3224,7 +3224,8 @@ ()
32243224
if ((check_wsrep_provider_env() == 1) || ($file_wsrep_provider ne "")) {
32253225
# Add galera test suites
32263226
mtr_report(" - adding wsrep, galera to default test suites");
3227-
push @DEFAULT_SUITES, qw(wsrep galera);
3227+
#push @DEFAULT_SUITES, qw(wsrep galera);
3228+
push @DEFAULT_SUITES, qw(wsrep);
32283229
}
32293230
}
32303231
}

‎mysql-test/suite/binlog/r/binlog_row_binlog.result

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -806,9 +806,11 @@ SELECT * FROM t1;
806806
c1
807807
1
808808
# Their values should be ON
809-
SHOW SESSION VARIABLES LIKE "%_checks";
809+
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
810810
Variable_name Value
811811
foreign_key_checks ON
812+
SHOW SESSION VARIABLES LIKE "unique_checks";
813+
Variable_name Value
812814
unique_checks ON
813815

814816
SET @@SESSION.foreign_key_checks= OFF;
@@ -824,9 +826,11 @@ c1
824826
1
825827
2
826828
# Their values should be OFF
827-
SHOW SESSION VARIABLES LIKE "%_checks";
829+
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
828830
Variable_name Value
829831
foreign_key_checks OFF
832+
SHOW SESSION VARIABLES LIKE "unique_checks";
833+
Variable_name Value
830834
unique_checks OFF
831835
# INSERT INTO t1 VALUES(2)
832836
# foreign_key_checks=1 and unique_checks=1
@@ -842,8 +846,10 @@ c1
842846
1
843847
2
844848
# Their values should be OFF
845-
SHOW SESSION VARIABLES LIKE "%_checks";
849+
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
846850
Variable_name Value
847851
foreign_key_checks OFF
852+
SHOW SESSION VARIABLES LIKE "unique_checks";
853+
Variable_name Value
848854
unique_checks OFF
849855
DROP TABLE t1;

‎mysql-test/suite/binlog/r/binlog_stm_binlog.result

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -618,9 +618,11 @@ SELECT * FROM t1;
618618
c1
619619
1
620620
# Their values should be ON
621-
SHOW SESSION VARIABLES LIKE "%_checks";
621+
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
622622
Variable_name Value
623623
foreign_key_checks ON
624+
SHOW SESSION VARIABLES LIKE "unique_checks";
625+
Variable_name Value
624626
unique_checks ON
625627

626628
SET @@SESSION.foreign_key_checks= OFF;
@@ -636,9 +638,11 @@ c1
636638
1
637639
2
638640
# Their values should be OFF
639-
SHOW SESSION VARIABLES LIKE "%_checks";
641+
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
640642
Variable_name Value
641643
foreign_key_checks OFF
644+
SHOW SESSION VARIABLES LIKE "unique_checks";
645+
Variable_name Value
642646
unique_checks OFF
643647
# INSERT INTO t1 VALUES(2)
644648
# foreign_key_checks=1 and unique_checks=1
@@ -654,8 +658,10 @@ c1
654658
1
655659
2
656660
# Their values should be OFF
657-
SHOW SESSION VARIABLES LIKE "%_checks";
661+
SHOW SESSION VARIABLES LIKE "foreign_key_checks";
658662
Variable_name Value
659663
foreign_key_checks OFF
664+
SHOW SESSION VARIABLES LIKE "unique_checks";
665+
Variable_name Value
660666
unique_checks OFF
661667
DROP TABLE t1;

‎mysql-test/suite/perfschema/r/rpl_statements.result

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ include/master-slave.inc
1414
show variables like '%binlog_format%';
1515
Variable_name Value
1616
binlog_format MIXED
17+
wsrep_forced_binlog_format NONE
1718
drop table if exists test.marker;
1819
select thread_id into @my_thread_id
1920
from performance_schema.threads
@@ -58,6 +59,7 @@ Expect 1
5859
show variables like '%binlog_format%';
5960
Variable_name Value
6061
binlog_format MIXED
62+
wsrep_forced_binlog_format NONE
6163
*** Clear statement events
6264

6365
*** Create/drop table, create/drop database

‎sql/sql_acl.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2516,9 +2516,9 @@ int check_change_password(THD *thd, const char *host, const char *user,
25162516

25172517
#ifdef WITH_WSREP
25182518
if ((!WSREP(thd) || !thd->wsrep_applier) &&
2519-
!thd->slave_thread && !thd->security_ctx->user[0])
2519+
!thd->slave_thread && !thd->security_ctx->priv_user[0])
25202520
#else
2521-
if (!thd->slave_thread && !thd->security_ctx->user[0])
2521+
if (!thd->slave_thread && !thd->security_ctx->priv_user[0])
25222522
#endif /* WITH_WSREP */
25232523
{
25242524
my_message(ER_PASSWORD_ANONYMOUS_USER, ER(ER_PASSWORD_ANONYMOUS_USER),

0 commit comments

Comments
 (0)