diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-12-31 10:17:35 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-12-31 10:17:35 +0200 |
| commit | bc1718c915e62b8612804c35cb71f4d7756a2115 (patch) | |
| tree | 75543dd4382501bf9233763f178934e542cb4b56 /sql | |
| parent | 07eb2fc4f32f0fdf0204e524f7a7a8e50c842dd7 (diff) | |
| download | mariadb-git-bc1718c915e62b8612804c35cb71f4d7756a2115.tar.gz | |
ha_innodb.cc:
Fix bug: could not switch trx isolation back to REPEATABLE READ after switching it to some other level
sql/ha_innodb.cc:
Fix bug: could not switch trx isolation back to REPEATABLE READ after switching it to some other level
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index dd718f02ba9..3ab7de5d3bb 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -3812,8 +3812,8 @@ innobase_map_isolation_level( enum_tx_isolation iso) /* in: MySQL isolation level code */ { switch(iso) { - case ISO_READ_COMMITTED: return(TRX_ISO_READ_COMMITTED); case ISO_REPEATABLE_READ: return(TRX_ISO_REPEATABLE_READ); + case ISO_READ_COMMITTED: return(TRX_ISO_READ_COMMITTED); case ISO_SERIALIZABLE: return(TRX_ISO_SERIALIZABLE); case ISO_READ_UNCOMMITTED: return(TRX_ISO_READ_UNCOMMITTED); default: ut_a(0); return(0); @@ -3868,11 +3868,9 @@ ha_innobase::external_lock( trx->n_mysql_tables_in_use++; prebuilt->mysql_has_locked = TRUE; - if (thd->variables.tx_isolation != ISO_REPEATABLE_READ) { - trx->isolation_level = innobase_map_isolation_level( + trx->isolation_level = innobase_map_isolation_level( (enum_tx_isolation) thd->variables.tx_isolation); - } if (trx->isolation_level == TRX_ISO_SERIALIZABLE && prebuilt->select_lock_type == LOCK_NONE) { |