From 32c9fe6bf5259e8144c2bb27f062d44bc3d4e610 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Mon, 3 Nov 2008 18:46:47 +0100 Subject: [PATCH] Bug #40360: Binlog related errors with binlog off Adding missing drop of created table and tidying display. --- mysql-test/r/innodb_mysql.result | 14 +++++--------- mysql-test/t/innodb_mysql.test | 5 ++--- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index 8e31389b6cd..2c14b1f2385 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -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; diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test index 4aaef57e068..ed8de208474 100644 --- a/mysql-test/t/innodb_mysql.test +++ b/mysql-test/t/innodb_mysql.test @@ -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;