diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-22 01:08:26 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-22 01:08:26 +0200 |
| commit | 08b43c99977bceb05d82b5a154c68387551310c2 (patch) | |
| tree | dc56e2d470e756106b4fd92a93a43b5b7065803f /mysql-test/t/innodb.test | |
| parent | bbb089cced796e66388c980c7634c6b55fca7fa4 (diff) | |
| download | mariadb-git-08b43c99977bceb05d82b5a154c68387551310c2.tar.gz | |
BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
Minor fixes to get proper detection of transaction isolation level when
inside external_lock().
mysql-test/t/disabled.def:
Enabling innodb.test again.
mysql-test/t/innodb.test:
Fixing some error codes. Test currently requires MIXED or ROW mode since
READ-COMMITTED and READ-UNCOMMITTED are not safe for STATEMENT mode, i.e.,
when the binary log is enabled.
storage/innobase/handler/ha_innodb.cc:
Using tx_isolation since trx->isolation_level is not defined when
inside external_lock().
Diffstat (limited to 'mysql-test/t/innodb.test')
| -rw-r--r-- | mysql-test/t/innodb.test | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 1e07c3c9aff..21a1354381a 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -15,6 +15,10 @@ -- source include/have_innodb.inc -- source include/have_log_bin.inc +# Disabling it temporarily for statement-based logging since some +# tests are not safe while binlog is on. +-- source include/have_binlog_format_mixed_or_row.inc + # # Small basic test with ignore # @@ -775,7 +779,7 @@ CREATE TABLE `t2` ( insert into t1 values (1,1),(2,2); insert into t2 values (1,1),(4,4); reset master; ---error ER_DUP_ENTRY_WITH_KEY_NAME +--error ER_DUP_ENTRY UPDATE t2,t1 SET t2.a=t1.a+2; # check select * from t2 /* must be (3,1), (4,4) */; @@ -787,7 +791,7 @@ delete from t2; insert into t1 values (1,2),(3,4),(4,4); insert into t2 values (1,2),(3,4),(4,4); reset master; ---error ER_DUP_ENTRY_WITH_KEY_NAME +--error ER_DUP_ENTRY UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; show master status /* there must be no UPDATE query event */; |