database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix for some failing tests.

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-06-26 12:11:12 -04:00
parent 9e1075eea0
commit 7ed27e1b8e
6 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/extra/binlog_tests/binlog.test
View File

@ -372,7 +372,8 @@ dfLtTBcBAAAAIgAAAPkAAAAAABcAAAAAAAcAAf/+AQAAAA==
SELECT * FROM t1; SELECT * FROM t1;
--echo # Their values should be ON --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 --echo
SET @@SESSION.foreign_key_checks= OFF; SET @@SESSION.foreign_key_checks= OFF;
@ -387,7 +388,8 @@ dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA==
SELECT * FROM t1; SELECT * FROM t1;
--echo # Their values should be OFF --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 # INSERT INTO t1 VALUES(2)
--echo # foreign_key_checks=1 and unique_checks=1 --echo # foreign_key_checks=1 and unique_checks=1
@ -401,7 +403,8 @@ dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA==
SELECT * FROM t1; SELECT * FROM t1;
--echo # Their values should be OFF --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; DROP TABLE t1;

3
mysql-test/mysql-test-run.pl
View File

@ -3224,7 +3224,8 @@ sub check_wsrep_support() {
if ((check_wsrep_provider_env() == 1) || ($file_wsrep_provider ne "")) { if ((check_wsrep_provider_env() == 1) || ($file_wsrep_provider ne "")) {
# Add galera test suites # Add galera test suites
mtr_report(" - adding wsrep, galera to default 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);
} }
} }
} }

12
mysql-test/suite/binlog/r/binlog_row_binlog.result
View File

@ -806,9 +806,11 @@ SELECT * FROM t1;
c1 c1
1 1
# Their values should be ON # Their values should be ON
SHOW SESSION VARIABLES LIKE "%_checks"; SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value Variable_name Value
foreign_key_checks ON foreign_key_checks ON
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks ON unique_checks ON
SET @@SESSION.foreign_key_checks= OFF; SET @@SESSION.foreign_key_checks= OFF;
@ -824,9 +826,11 @@ c1
1 1
2 2
# Their values should be OFF # Their values should be OFF
SHOW SESSION VARIABLES LIKE "%_checks"; SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value Variable_name Value
foreign_key_checks OFF foreign_key_checks OFF
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks OFF unique_checks OFF
# INSERT INTO t1 VALUES(2) # INSERT INTO t1 VALUES(2)
# foreign_key_checks=1 and unique_checks=1 # foreign_key_checks=1 and unique_checks=1
@ -842,8 +846,10 @@ c1
1 1
2 2
# Their values should be OFF # Their values should be OFF
SHOW SESSION VARIABLES LIKE "%_checks"; SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value Variable_name Value
foreign_key_checks OFF foreign_key_checks OFF
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks OFF unique_checks OFF
DROP TABLE t1; DROP TABLE t1;

12
mysql-test/suite/binlog/r/binlog_stm_binlog.result
View File

@ -618,9 +618,11 @@ SELECT * FROM t1;
c1 c1
1 1
# Their values should be ON # Their values should be ON
SHOW SESSION VARIABLES LIKE "%_checks"; SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value Variable_name Value
foreign_key_checks ON foreign_key_checks ON
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks ON unique_checks ON
SET @@SESSION.foreign_key_checks= OFF; SET @@SESSION.foreign_key_checks= OFF;
@ -636,9 +638,11 @@ c1
1 1
2 2
# Their values should be OFF # Their values should be OFF
SHOW SESSION VARIABLES LIKE "%_checks"; SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value Variable_name Value
foreign_key_checks OFF foreign_key_checks OFF
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks OFF unique_checks OFF
# INSERT INTO t1 VALUES(2) # INSERT INTO t1 VALUES(2)
# foreign_key_checks=1 and unique_checks=1 # foreign_key_checks=1 and unique_checks=1
@ -654,8 +658,10 @@ c1
1 1
2 2
# Their values should be OFF # Their values should be OFF
SHOW SESSION VARIABLES LIKE "%_checks"; SHOW SESSION VARIABLES LIKE "foreign_key_checks";
Variable_name Value Variable_name Value
foreign_key_checks OFF foreign_key_checks OFF
SHOW SESSION VARIABLES LIKE "unique_checks";
Variable_name Value
unique_checks OFF unique_checks OFF
DROP TABLE t1; DROP TABLE t1;

2
mysql-test/suite/perfschema/r/rpl_statements.result
View File

@ -14,6 +14,7 @@ include/master-slave.inc
show variables like '%binlog_format%'; show variables like '%binlog_format%';
Variable_name Value Variable_name Value
binlog_format MIXED binlog_format MIXED
wsrep_forced_binlog_format NONE
drop table if exists test.marker; drop table if exists test.marker;
select thread_id into @my_thread_id select thread_id into @my_thread_id
from performance_schema.threads from performance_schema.threads
@ -58,6 +59,7 @@ Expect 1
show variables like '%binlog_format%'; show variables like '%binlog_format%';
Variable_name Value Variable_name Value
binlog_format MIXED binlog_format MIXED
wsrep_forced_binlog_format NONE
*** Clear statement events *** Clear statement events
*** Create/drop table, create/drop database *** Create/drop table, create/drop database

4
sql/sql_acl.cc
View File

@ -2516,9 +2516,9 @@ int check_change_password(THD *thd, const char *host, const char *user,
#ifdef WITH_WSREP #ifdef WITH_WSREP
if ((!WSREP(thd) || !thd->wsrep_applier) && if ((!WSREP(thd) || !thd->wsrep_applier) &&
!thd->slave_thread && !thd->security_ctx->user[0]) !thd->slave_thread && !thd->security_ctx->priv_user[0])
#else #else
if (!thd->slave_thread && !thd->security_ctx->user[0]) if (!thd->slave_thread && !thd->security_ctx->priv_user[0])
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
{ {
my_message(ER_PASSWORD_ANONYMOUS_USER, ER(ER_PASSWORD_ANONYMOUS_USER), my_message(ER_PASSWORD_ANONYMOUS_USER, ER(ER_PASSWORD_ANONYMOUS_USER),