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-05-28 19:56:39+02:00, mats@stripped +5 -0
BUG#23051 (READ COMMITTED breaks mixed and statement-based
replication):
Printing error when switching to READ COMMITTED transaction
isolation level when in STATEMENT or MIXED binlog mode, or
when trying to switch out of ROW binlog mode when in READ
COMMITTED transaction isolation level. In the latter case, the
transaction isolation level and the binlog format will be untouched.
mysql-test/r/binlog_tx_isolation.result@stripped, 2007-05-28 19:56:34+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-05-28 19:56:34+02:00, mats@stripped +0 -0
mysql-test/t/binlog_tx_isolation.test@stripped, 2007-05-28 19:56:34+02:00, mats@stripped +64 -0
New BitKeeper file ``mysql-test/t/binlog_tx_isolation.test''
mysql-test/t/binlog_tx_isolation.test@stripped, 2007-05-28 19:56:34+02:00, mats@stripped +0 -0
sql/handler.h@stripped, 2007-05-28 19:56:33+02:00, mats@stripped +2 -0
Adding declaration of already global arrays.
sql/set_var.cc@stripped, 2007-05-28 19:56:33+02:00, mats@stripped +34 -0
Printing error message and returning error when trying to switch to
READ COMMITTED transaction isolation level in MIXED or STATMENT
binlog mode or when trying to switch out from ROW binlog mode when
in READ COMMITTED transaction isolation level.
sql/share/errmsg.txt@stripped, 2007-05-28 19:56:34+02:00, mats@stripped +4 -0
Adding error messages for invalid changes of transaction isolation level
and binlog mode switch.
# 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
--- 1.256/sql/handler.h 2007-05-28 19:56:48 +02:00
+++ 1.257/sql/handler.h 2007-05-28 19:56:48 +02:00
@@ -1675,6 +1675,8 @@
/* Some extern variables used with handlers */
extern const char *ha_row_type[];
+extern const char *tx_isolation_names[];
+extern const char *binlog_format_names[];
extern TYPELIB tx_isolation_typelib;
extern TYPELIB myisam_stats_method_typelib;
extern ulong total_ha, total_ha_2pc;
--- 1.155/sql/share/errmsg.txt 2007-05-28 19:56:48 +02:00
+++ 1.156/sql/share/errmsg.txt 2007-05-28 19:56:48 +02:00
@@ -6062,3 +6062,7 @@
ER_BINLOG_UNSAFE_STATEMENT
eng "Statement is not safe to log in statement format."
+ER_BINLOG_UNSAFE_TX_ISOLATION
+ eng "Transaction isolation level '%s' is not safe for '%s' binlog mode"
+ER_TX_ISOLATION_PREVENTS_BINLOG_MODE_SWITCH
+ eng "Transaction isolation level '%s' prevents leaving '%s' binlog mode"
--- New file ---
+++ mysql-test/r/binlog_tx_isolation.result 07/05/28 19:56:34
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
--- New file ---
+++ mysql-test/t/binlog_tx_isolation.test 07/05/28 19:56:34
source include/have_innodb.inc;
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);
# Check that errors are generated when trying to set READ COMMITTED
# transaction level isolation in with the wrong binlogging on and not
# when row-based is on.
SET BINLOG_FORMAT=STATEMENT;
BEGIN;
error ER_BINLOG_UNSAFE_TX_ISOLATION;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
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;
error ER_BINLOG_UNSAFE_TX_ISOLATION;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
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;
# Now we check that it is not possible to switch out from binlog mode
# ROW when the transaction isolation level is READ COMMITTED;
query_vertical SELECT @@session.tx_isolation, @@session.binlog_format;
BEGIN;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
error ER_TX_ISOLATION_PREVENTS_BINLOG_MODE_SWITCH;
SET BINLOG_FORMAT=MIXED;
UPDATE t1 SET b = a*a*a*a WHERE a > 3;
COMMIT;
query_vertical SELECT @@session.tx_isolation, @@session.binlog_format;
BEGIN;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
error ER_TX_ISOLATION_PREVENTS_BINLOG_MODE_SWITCH;
SET BINLOG_FORMAT=STATEMENT;
UPDATE t1 SET b = a*a*a*a WHERE a > 3;
COMMIT;
query_vertical SELECT @@session.tx_isolation, @@session.binlog_format;
--- 1.229/sql/set_var.cc 2007-05-28 19:56:48 +02:00
+++ 1.230/sql/set_var.cc 2007-05-28 19:56:48 +02:00
@@ -118,6 +118,7 @@
delay_key_write_type_names, NULL
};
+
static int sys_check_ftb_syntax(THD *thd, set_var *var);
static bool sys_update_ftb_syntax(THD *thd, set_var * var);
static void sys_default_ftb_syntax(THD *thd, enum_var_type type);
@@ -1207,6 +1208,26 @@
my_error(ER_CANT_CHANGE_TX_ISOLATION, MYF(0));
return 1;
}
+
+ var->save_result.ulong_value= var->value->val_int();
+ if (mysql_bin_log.is_open() && (thd->options & OPTION_BIN_LOG) &&
+ var->save_result.ulong_value == ISO_READ_COMMITTED)
+ {
+ switch (thd->variables.binlog_format)
+ {
+ case BINLOG_FORMAT_STMT:
+ case BINLOG_FORMAT_MIXED:
+ my_error(ER_BINLOG_UNSAFE_TX_ISOLATION, MYF(0),
+ tx_isolation_names[var->save_result.ulong_value],
+ binlog_format_names[thd->variables.binlog_format]);
+ return 1;
+ break;
+
+ case BINLOG_FORMAT_ROW:
+ break;
+ }
+ }
+
return 0;
}
@@ -1343,6 +1364,19 @@
my_error(ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT, MYF(0));
return 1;
}
+
+ /*
+ If the transaction isolation level is 'READ COMMITTED', we do not
+ allow switching out from it.
+ */
+ if (thd->variables.tx_isolation == ISO_READ_COMMITTED)
+ {
+ my_error(ER_TX_ISOLATION_PREVENTS_BINLOG_MODE_SWITCH, MYF(0),
+ tx_isolation_names[thd->variables.tx_isolation],
+ binlog_format_names[thd->variables.binlog_format]);
+ return 1;
+ }
+
#ifdef HAVE_NDB_BINLOG
/*
Cluster does not support changing the binlog format on the fly yet.
| Thread |
|---|
| • bk commit into 5.1 tree (mats:1.2581) BUG#23051 | Mats Kindahl | 28 May |
