Commit 32c9fe6b authored by Mats Kindahl's avatar Mats Kindahl
Browse files

Bug #40360: Binlog related errors with binlog off 

Adding missing drop of created table and tidying display.
parent 005e7fc3

mysql-test/r/innodb_mysql.result

+5 −9
Original line number Diff line number Diff line
@@ -1670,14 +1670,10 @@ id select_type table type possible_keys key key_len ref rows Extra 
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

select @@session.sql_log_bin, @@session.binlog_format, @@session.tx_isolation;

@@session.sql_log_bin	1

@@session.binlog_format	STATEMENT

@@session.tx_isolation	READ-COMMITTED

CREATE TABLE t1 ( a INT ) ENGINE=InnoDB;

INSERT INTO t1 VALUES(1);

DROP TABLE t1;

mysql-test/t/innodb_mysql.test

+2 −3
Original line number Diff line number Diff line
@@ -38,9 +38,8 @@ drop table t1, t2; 


SET SESSION BINLOG_FORMAT=STATEMENT;

SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

SHOW VARIABLES LIKE 'log_bin';

SELECT @@session.binlog_format;

SELECT @@session.tx_isolation;

query_vertical select @@session.sql_log_bin, @@session.binlog_format, @@session.tx_isolation;

CREATE TABLE t1 ( a INT ) ENGINE=InnoDB;

INSERT INTO t1 VALUES(1);

DROP TABLE t1;