Skip to content

M
mariadb
Commit 562f3ce6 authored by heikki@hundin.mysql.fi's avatar heikki@hundin.mysql.fi
Browse files
Options

Merge heikki@build.mysql.com:/home/bk/mysql-4.0 

into hundin.mysql.fi:/home/heikki/mysql-4.0
parents f35f4329 3b7140ae
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
innobase/row/row0sel.c
View file @ 562f3ce6
...@@ -2810,8 +2810,6 @@ row_search_for_mysql( ...@@ -2810,8 +2810,6 @@ row_search_for_mysql(
mode = pcur->search_mode; mode = pcur->search_mode;
} }
mtr_start(&mtr);
/* In a search where at most one record in the index may match, we /* In a search where at most one record in the index may match, we
can use a LOCK_REC_NOT_GAP type record lock when locking a non-delete- can use a LOCK_REC_NOT_GAP type record lock when locking a non-delete-
marked matching record. marked matching record.
...@@ -2834,10 +2832,13 @@ row_search_for_mysql( ...@@ -2834,10 +2832,13 @@ row_search_for_mysql(
if (direction != 0 && !prebuilt->used_in_HANDLER) { if (direction != 0 && !prebuilt->used_in_HANDLER) {
trx->op_info = (char*)"";
return(DB_RECORD_NOT_FOUND); return(DB_RECORD_NOT_FOUND);
} }
} }
mtr_start(&mtr);
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
/* PHASE 2: Try fast adaptive hash index search if possible */ /* PHASE 2: Try fast adaptive hash index search if possible */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7