1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

Browse Source 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2002-12-03 22:06:48 +02:00
commit ad2be3b2b2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
innobase/row/row0sel.c
View File

@ -2702,14 +2702,22 @@ row_search_for_mysql(
unique_search_from_clust_index = TRUE; unique_search_from_clust_index = TRUE;
if (prebuilt->select_lock_type == LOCK_NONE if (trx->mysql_n_tables_locked == 0
&& prebuilt->select_lock_type == LOCK_NONE
&& trx->isolation_level > TRX_ISO_READ_UNCOMMITTED && trx->isolation_level > TRX_ISO_READ_UNCOMMITTED
&& trx->read_view) { && trx->read_view) {
/* This is a SELECT query done as a consistent read, /* This is a SELECT query done as a consistent read,
and the read view has already been allocated: and the read view has already been allocated:
let us try a search shortcut through the hash let us try a search shortcut through the hash
index */ index.
NOTE that we must also test that
mysql_n_tables_locked == 0, because this might
also be INSERT INTO ... SELECT ... or
CREATE TABLE ... SELECT ... . Our algorithm is
NOT prepared to inserts interleaved with the SELECT,
and if we try that, we can deadlock on the adaptive
hash index semaphore! */
if (btr_search_latch.writer != RW_LOCK_NOT_LOCKED) { if (btr_search_latch.writer != RW_LOCK_NOT_LOCKED) {
/* There is an x-latch request: release /* There is an x-latch request: release