diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-28 15:32:05 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-28 15:32:05 +0200 |
| commit | 95754006eb4b4e537ee314afd96081bda9524cb0 (patch) | |
| tree | 1d29b6381ca710436adbad6b29d6b7bf43018332 /sql/ha_innodb.cc | |
| parent | ada963e01209a6dc8778010e114944f2438462e9 (diff) | |
| parent | 68045dfd4bf4077d04ce50242bb7e3d1b9d31232 (diff) | |
| download | mariadb-git-95754006eb4b4e537ee314afd96081bda9524cb0.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
BitKeeper/deleted/.del-disabled.def:
Delete: mysql-test/t/disabled.def
libmysqld/lib_sql.cc:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
mysql-test/r/innodb.result:
Manual merge from 4.1 to 5.0
mysql-test/r/select.result:
Manual merge from 4.1 to 5.0
mysql-test/t/select.test:
Manual merge from 4.1 to 5.0
sql/item.cc:
Manual merge from 4.1 to 5.0
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index afa8570c144..290ee1d7883 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -6688,6 +6688,13 @@ ha_innobase::store_lock( prebuilt->select_lock_type = LOCK_NONE; prebuilt->stored_select_lock_type = LOCK_NONE; + } else if (thd->lex->sql_command == SQLCOM_CHECKSUM) { + /* Use consistent read for checksum table and + convert lock type to the TL_READ */ + + prebuilt->select_lock_type = LOCK_NONE; + prebuilt->stored_select_lock_type = LOCK_NONE; + lock.type = TL_READ; } else { prebuilt->select_lock_type = LOCK_S; prebuilt->stored_select_lock_type = LOCK_S; |