summaryrefslogtreecommitdiff
path: root/storage/innobase/handler/ha_innodb.cc
diff options
context:
space:
mode:
authorTimothy Smith <timothy.smith@sun.com>2009-01-13 15:14:11 +0100
committerTimothy Smith <timothy.smith@sun.com>2009-01-13 15:14:11 +0100
commit96415bb39da6cafaf2059de6d9b58dbc115c7f92 (patch)
tree52386ea6d5d7150ae50430b04e3966b4c6364a91 /storage/innobase/handler/ha_innodb.cc
parent13927f53c5603f13b9f5a462140e3ae13877ff2a (diff)
downloadmariadb-git-96415bb39da6cafaf2059de6d9b58dbc115c7f92.tar.gz
Applying InnoDB snapshot innodb-5.1-ss3603
Detailed description of changes: r3601 | marko | 2008-12-22 16:05:19 +0200 (Mon, 22 Dec 2008) | 9 lines branches/5.1: Make SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED a true replacement of SET GLOBAL INNODB_LOCKS_UNSAFE_FOR_BINLOG=1. This fixes an error that was introduced in r370, causing semi-consistent read not to not unlock rows in READ UNCOMMITTED mode. (Bug #41671, Issue #146) rb://67 approved by Heikki Tuuri
Diffstat (limited to 'storage/innobase/handler/ha_innodb.cc')
-rw-r--r--storage/innobase/handler/ha_innodb.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 366bc3966c7..513ce85ad0c 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -4129,7 +4129,8 @@ ha_innobase::unlock_row(void)
switch (prebuilt->row_read_type) {
case ROW_READ_WITH_LOCKS:
if (!srv_locks_unsafe_for_binlog
- || prebuilt->trx->isolation_level == TRX_ISO_READ_COMMITTED) {
+ && prebuilt->trx->isolation_level
+ != TRX_ISO_READ_COMMITTED) {
break;
}
/* fall through */