diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-11-14 13:16:31 +0300 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2017-11-16 16:29:14 +0800 |
| commit | 31bd86c8df63a4d9e98d67541e136456bd6d9cc2 (patch) | |
| tree | 32bab49e28732a7bd5c29b64c032d822b49de4af | |
| parent | 5fdd51e7c074af7713d5de691e47335ce805492e (diff) | |
| download | mariadb-git-31bd86c8df63a4d9e98d67541e136456bd6d9cc2.tar.gz | |
Tests: dependency on wsrep removed from sql_sequence tests
Affected tests:
sql_sequence.gtid sql_sequence.replication
| -rw-r--r-- | mysql-test/suite/sql_sequence/gtid.result | 7 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/gtid.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/replication.result | 14 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/replication.test | 4 |
4 files changed, 12 insertions, 15 deletions
diff --git a/mysql-test/suite/sql_sequence/gtid.result b/mysql-test/suite/sql_sequence/gtid.result index 996b7ac906d..8ca9a397354 100644 --- a/mysql-test/suite/sql_sequence/gtid.result +++ b/mysql-test/suite/sql_sequence/gtid.result @@ -600,10 +600,9 @@ set binlog_format=statement ------------------------------------------ connection master; set session binlog_format=statement; -show session variables like '%binlog_format%'; -Variable_name Value -binlog_format STATEMENT -wsrep_forced_binlog_format NONE +select @@session.binlog_format; +@@session.binlog_format +STATEMENT create sequence s1 cache 2; select next value for s1; ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging. diff --git a/mysql-test/suite/sql_sequence/gtid.test b/mysql-test/suite/sql_sequence/gtid.test index c8f410ea1f1..63ed7ec5264 100644 --- a/mysql-test/suite/sql_sequence/gtid.test +++ b/mysql-test/suite/sql_sequence/gtid.test @@ -503,7 +503,7 @@ drop sequence s1; --echo ------------------------------------------ connection master; set session binlog_format=statement; -show session variables like '%binlog_format%'; +select @@session.binlog_format; create sequence s1 cache 2; --error ER_BINLOG_STMT_MODE_AND_ROW_ENGINE select next value for s1; diff --git a/mysql-test/suite/sql_sequence/replication.result b/mysql-test/suite/sql_sequence/replication.result index 5c7d45614e9..0397e801a16 100644 --- a/mysql-test/suite/sql_sequence/replication.result +++ b/mysql-test/suite/sql_sequence/replication.result @@ -696,10 +696,9 @@ set binlog_format=statement ------------------------------------------ connection master; set session binlog_format=statement; -show session variables like '%binlog_format%'; -Variable_name Value -binlog_format STATEMENT -wsrep_forced_binlog_format NONE +select @@session.binlog_format; +@@session.binlog_format +STATEMENT create sequence s1 cache 2; select next value for s1; ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging. @@ -719,10 +718,9 @@ set binlog_format=mixed ------------------------------------------ connection master; set session binlog_format=mixed; -show session variables like '%binlog_format%'; -Variable_name Value -binlog_format MIXED -wsrep_forced_binlog_format NONE +select @@session.binlog_format; +@@session.binlog_format +MIXED create sequence s1 cache 2; select next value for s1; next value for s1 diff --git a/mysql-test/suite/sql_sequence/replication.test b/mysql-test/suite/sql_sequence/replication.test index 7bd6f00e2ed..50ca7dad378 100644 --- a/mysql-test/suite/sql_sequence/replication.test +++ b/mysql-test/suite/sql_sequence/replication.test @@ -582,7 +582,7 @@ drop sequence s1; --echo ------------------------------------------ connection master; set session binlog_format=statement; -show session variables like '%binlog_format%'; +select @@session.binlog_format; create sequence s1 cache 2; --error ER_BINLOG_STMT_MODE_AND_ROW_ENGINE select next value for s1; @@ -603,7 +603,7 @@ drop sequence s1; --echo ------------------------------------------ connection master; set session binlog_format=mixed; -show session variables like '%binlog_format%'; +select @@session.binlog_format; create sequence s1 cache 2; select next value for s1; |