bk commit into 5.1 tree (mats:1.2555) BUG#23051

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-14 13:33:31+02:00, mats@stripped +2 -0
  BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
  Temporarily using thd_tx_isolation() until decision is made on how to
  get the isolation level.

  mysql-test/r/binlog_tx_isolation.result@stripped, 2007-06-14 13:33:26+02:00,
mats@stripped +48 -0
    New BitKeeper file ``mysql-test/r/binlog_tx_isolation.result''

  mysql-test/r/binlog_tx_isolation.result@stripped, 2007-06-14 13:33:26+02:00,
mats@stripped +0 -0

  storage/innobase/handler/ha_innodb.cc@stripped, 2007-06-14 13:33:25+02:00,
mats@stripped +1 -1
    Using thd_tx_isolation() instead of direct access to variable.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	kindahl-laptop.dnsalias.net
# Root:	/home/bk/b23051-mysql-5.1-rpl
--- New file ---
+++ mysql-test/r/binlog_tx_isolation.result	07/06/14 13:33:26
CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=INNODB;
INSERT INTO t1 VALUES (1,1),(2,2),(3,3),(4,4),(5,5),(6,6);
SET BINLOG_FORMAT=STATEMENT;
BEGIN;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
ERROR HY000: Transaction isolation level 'READ-COMMITTED' is not safe for 'STATEMENT'
binlog mode
UPDATE t1 SET b = a*a WHERE a > 1;
COMMIT;
BEGIN;
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
UPDATE t1 SET b = a*a WHERE a > 1;
COMMIT;
BEGIN;
SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
UPDATE t1 SET b = a*a WHERE a > 1;
COMMIT;
SET BINLOG_FORMAT=MIXED;
BEGIN;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
ERROR HY000: Transaction isolation level 'READ-COMMITTED' is not safe for 'MIXED' binlog
mode
UPDATE t1 SET b = a*a*a WHERE a > 2;
COMMIT;
SET BINLOG_FORMAT=ROW;
BEGIN;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
UPDATE t1 SET b = a*a*a*a WHERE a > 3;
COMMIT;
SELECT @@session.tx_isolation, @@session.binlog_format;
@@session.tx_isolation	READ-COMMITTED
@@session.binlog_format	ROW
BEGIN;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
SET BINLOG_FORMAT=MIXED;
ERROR HY000: Transaction isolation level 'READ-COMMITTED' prevents leaving 'ROW' binlog
mode
UPDATE t1 SET b = a*a*a*a WHERE a > 3;
COMMIT;
SELECT @@session.tx_isolation, @@session.binlog_format;
@@session.tx_isolation	READ-COMMITTED
@@session.binlog_format	ROW
BEGIN;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
SET BINLOG_FORMAT=STATEMENT;
ERROR HY000: Transaction isolation level 'READ-COMMITTED' prevents leaving 'ROW' binlog
mode
UPDATE t1 SET b = a*a*a*a WHERE a > 3;
COMMIT;
SELECT @@session.tx_isolation, @@session.binlog_format;
@@session.tx_isolation	READ-COMMITTED
@@session.binlog_format	ROW


--- 1.340/storage/innobase/handler/ha_innodb.cc	2007-06-14 13:33:44 +02:00
+++ 1.341/storage/innobase/handler/ha_innodb.cc	2007-06-14 13:33:44 +02:00
@@ -2285,7 +2285,7 @@
            is called from mysql_lock_tables()) until after this
            function has been called (which is called in lock_tables()
            before that function calls mysql_lock_tables()). */
-        ulong const tx_isolation= thd->variables.tx_isolation;
+        ulong const tx_isolation= thd_tx_isolation(thd);
         if (tx_isolation <= ISO_READ_COMMITTED)
         {
 	        ulong const binlog_format= thd->variables.binlog_format;