summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb_mysql.result
diff options
context:
space:
mode:
authorMats Kindahl <mats@sun.com>2008-11-03 12:14:48 +0100
committerMats Kindahl <mats@sun.com>2008-11-03 12:14:48 +0100
commitc3a5b59676a284232e4d3672f6c223a45023b9a6 (patch)
tree9965b6a65160a509a7a66a170bfc301ff715afba /mysql-test/r/innodb_mysql.result
parente291aab7da9587f742291e7cc5e10e568846066e (diff)
downloadmariadb-git-c3a5b59676a284232e4d3672f6c223a45023b9a6.tar.gz
Bug #40360: Binlog related errors with binlog off
When statement-based replication is used, and the transaction isolation level is READ-COMMITTED or stricter, InnoDB will print an error because statement-based replication might lead to inconsistency between master and slave databases. However, when the binary log is not engaged, this is not an issue and an error should not be printed. This patch makes thd_binlog_format() return BINLOG_FORMAT_ UNSPEC when the binary log is not engaged for the given thread. mysql-test/t/innodb_mysql.test: Adding test that no error message is printed from inside InnoDB when the binary log is turned off.
Diffstat (limited to 'mysql-test/r/innodb_mysql.result')
-rw-r--r--mysql-test/r/innodb_mysql.result13
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index 985f4d2b464..8e31389b6cd 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -1668,3 +1668,16 @@ explain select a from t2 where a=b;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 index NULL a 10 NULL # Using where; Using index
drop table t1, t2;
+SET SESSION BINLOG_FORMAT=STATEMENT;
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+SHOW VARIABLES LIKE 'log_bin';
+Variable_name Value
+log_bin OFF
+SELECT @@session.binlog_format;
+@@session.binlog_format
+STATEMENT
+SELECT @@session.tx_isolation;
+@@session.tx_isolation
+READ-COMMITTED
+CREATE TABLE t1 ( a INT ) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(1);