summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb_mysql.result
diff options
context:
space:
mode:
authorMats Kindahl <mats@sun.com>2008-11-03 18:46:47 +0100
committerMats Kindahl <mats@sun.com>2008-11-03 18:46:47 +0100
commitad8ffe6add46e50b338301b28314799062156207 (patch)
treecf811220fc8861238f18a4cdc11c0ae712140085 /mysql-test/r/innodb_mysql.result
parentc3a5b59676a284232e4d3672f6c223a45023b9a6 (diff)
downloadmariadb-git-ad8ffe6add46e50b338301b28314799062156207.tar.gz
Bug #40360: Binlog related errors with binlog off
Adding missing drop of created table and tidying display. mysql-test/t/innodb_mysql.test: Adding drop of created table and cleaning variable display
Diffstat (limited to 'mysql-test/r/innodb_mysql.result')
-rw-r--r--mysql-test/r/innodb_mysql.result14
1 files changed, 5 insertions, 9 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;