diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-02 14:41:31 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-02 14:41:31 +0200 |
| commit | ba8ed9315a7dc7f1c8850f9104d5bc5fc052231f (patch) | |
| tree | 1cd07128da563a38de7c4db5f49bd4942e69bb1e /sql | |
| parent | 0b34c533729ef20d73a3a9954933e8a867ac7923 (diff) | |
| parent | bc1718c915e62b8612804c35cb71f4d7756a2115 (diff) | |
| download | mariadb-git-ba8ed9315a7dc7f1c8850f9104d5bc5fc052231f.tar.gz | |
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
sql/ha_innodb.cc:
Auto merged
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 b34de8cb831..baeb16997b6 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -3809,8 +3809,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); @@ -3865,11 +3865,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) { |