diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-15 18:41:36 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-15 18:41:36 -0400 |
| commit | dc0f1864ae09068dee8c340e4b3a687854c3200f (patch) | |
| tree | 6be84a7d9d6ed04aa31a5bb9a8de1202b5ef8c79 | |
| parent | 9ee0dca5d9917b3b3e860442d624135de03648d1 (diff) | |
| download | mariadb-git-dc0f1864ae09068dee8c340e4b3a687854c3200f.tar.gz | |
Fix for binlog tests.mariadb-galera-5.5.39
| -rw-r--r-- | mysql-test/extra/binlog_tests/binlog.test | 6 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_row_binlog.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_stm_binlog.result | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test index 63088365b0c..afaaef7b04b 100644 --- a/mysql-test/extra/binlog_tests/binlog.test +++ b/mysql-test/extra/binlog_tests/binlog.test @@ -369,7 +369,7 @@ dfLtTBcBAAAAIgAAAPkAAAAAABcAAAAAAAcAAf/+AQAAAA== SELECT * FROM t1; --echo # Their values should be ON -SHOW SESSION VARIABLES LIKE "%_checks"; +SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "%_checks" AND VARIABLE_NAME NOT LIKE 'wsrep%'; --echo SET @@SESSION.foreign_key_checks= OFF; @@ -384,7 +384,7 @@ dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA== SELECT * FROM t1; --echo # Their values should be OFF -SHOW SESSION VARIABLES LIKE "%_checks"; +SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "%_checks" AND VARIABLE_NAME NOT LIKE 'wsrep%'; --echo # INSERT INTO t1 VALUES(2) --echo # foreign_key_checks=1 and unique_checks=1 @@ -398,7 +398,7 @@ dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA== SELECT * FROM t1; --echo # Their values should be OFF -SHOW SESSION VARIABLES LIKE "%_checks"; +SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "%_checks" AND VARIABLE_NAME NOT LIKE 'wsrep%'; DROP TABLE t1; diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result index ba160aabb23..70a72baf49c 100644 --- a/mysql-test/suite/binlog/r/binlog_row_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result @@ -780,7 +780,7 @@ SELECT * FROM t1; c1 1 # Their values should be ON -SHOW SESSION VARIABLES LIKE "%_checks"; +SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "%_checks" AND VARIABLE_NAME NOT LIKE 'wsrep%'; Variable_name Value foreign_key_checks ON unique_checks ON @@ -798,7 +798,7 @@ c1 1 2 # Their values should be OFF -SHOW SESSION VARIABLES LIKE "%_checks"; +SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "%_checks" AND VARIABLE_NAME NOT LIKE 'wsrep%'; Variable_name Value foreign_key_checks OFF unique_checks OFF @@ -816,7 +816,7 @@ c1 1 2 # Their values should be OFF -SHOW SESSION VARIABLES LIKE "%_checks"; +SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "%_checks" AND VARIABLE_NAME NOT LIKE 'wsrep%'; Variable_name Value foreign_key_checks OFF unique_checks OFF diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result index 68e76921ff3..97a2846d063 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result @@ -587,7 +587,7 @@ SELECT * FROM t1; c1 1 # Their values should be ON -SHOW SESSION VARIABLES LIKE "%_checks"; +SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "%_checks" AND VARIABLE_NAME NOT LIKE 'wsrep%'; Variable_name Value foreign_key_checks ON unique_checks ON @@ -605,7 +605,7 @@ c1 1 2 # Their values should be OFF -SHOW SESSION VARIABLES LIKE "%_checks"; +SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "%_checks" AND VARIABLE_NAME NOT LIKE 'wsrep%'; Variable_name Value foreign_key_checks OFF unique_checks OFF @@ -623,7 +623,7 @@ c1 1 2 # Their values should be OFF -SHOW SESSION VARIABLES LIKE "%_checks"; +SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "%_checks" AND VARIABLE_NAME NOT LIKE 'wsrep%'; Variable_name Value foreign_key_checks OFF unique_checks OFF |