diff options
| author | unknown <aivanov@mysql.com> | 2006-04-01 01:54:15 +0400 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-04-01 01:54:15 +0400 |
| commit | f6ffb77cb4dce0a337931fb7bdd08352eee4d9be (patch) | |
| tree | 0fad636355da0a66360a4141a35c2898d3bae1b2 /sql/ha_innodb.cc | |
| parent | e40b76c970b1b49cf35f5ccb29395eb454069238 (diff) | |
| download | mariadb-git-f6ffb77cb4dce0a337931fb7bdd08352eee4d9be.tar.gz | |
Applied innodb-5.0-ss398 snapshot.
Fixed BUG#15650: DELETE with LEFT JOIN crashes server
with innodb_locks_unsafe_for_binlog.
Fixed compilation problem with non-C99 compilers
in btr0sea.c
innobase/btr/btr0sea.c:
Applied innodb-5.0-ss398 snapshot.
Fix compilation problem with non-C99 compilers.
sql/ha_innodb.cc:
Applied innodb-5.0-ss398 snapshot.
Remove assertion ut_error which crashes the mysqld
server if it prints a warning about the adaptive latch.
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 4b25f639a8f..41f017e6405 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -989,7 +989,6 @@ innobase_query_caching_of_table_permitted( mutex_enter_noninline(&kernel_mutex); trx_print(stderr, trx, 1024); mutex_exit_noninline(&kernel_mutex); - ut_error; } innobase_release_stat_resources(trx); @@ -3832,7 +3831,14 @@ ha_innobase::unlock_row(void) mem_analyze_corruption((byte *) prebuilt->trx); ut_error; } - + + /* Consistent read does not take any locks, thus there is + nothing to unlock. */ + + if (prebuilt->select_lock_type == LOCK_NONE) { + DBUG_VOID_RETURN; + } + if (srv_locks_unsafe_for_binlog) { row_unlock_for_mysql(prebuilt, FALSE); } |