bzr commit into mysql-5.1 branch (mats:2774) Bug#40360

[Mats Kindahl]

#At file:///home/bzr/bugs/b40360-5.1/

 2774 Mats Kindahl	2008-11-03
      Bug #40360: Binlog related errors with binlog off
      
      Adding missing drop of created table and tidying display.
modified:
  mysql-test/r/innodb_mysql.result
  mysql-test/t/innodb_mysql.test

per-file messages:
  mysql-test/t/innodb_mysql.test
    Adding drop of created table and cleaning variable display
=== modified file 'mysql-test/r/innodb_mysql.result'
--- a/mysql-test/r/innodb_mysql.result	2008-11-03 11:14:48 +0000
+++ b/mysql-test/r/innodb_mysql.result	2008-11-03 17:46:47 +0000
@@ -1670,14 +1670,10 @@ id	select_type	table	type	possible_keys	
 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;

=== modified file 'mysql-test/t/innodb_mysql.test'
--- a/mysql-test/t/innodb_mysql.test	2008-11-03 11:14:48 +0000
+++ b/mysql-test/t/innodb_mysql.test	2008-11-03 17:46:47 +0000
@@ -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;