mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
row0sel.c:
Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()
This commit is contained in:
parent
d5646eb6c5
commit
aefe018b67
1 changed files with 12 additions and 12 deletions
|
@ -3305,12 +3305,12 @@ rec_loop:
|
|||
err = sel_set_rec_lock(rec, index,
|
||||
prebuilt->select_lock_type,
|
||||
LOCK_ORDINARY, thr);
|
||||
if (err != DB_SUCCESS) {
|
||||
|
||||
goto lock_wait_or_error;
|
||||
}
|
||||
}
|
||||
|
||||
if (err != DB_SUCCESS) {
|
||||
|
||||
goto lock_wait_or_error;
|
||||
}
|
||||
}
|
||||
/* A page supremum record cannot be in the result set: skip
|
||||
it now that we have placed a possible lock on it */
|
||||
|
@ -3413,12 +3413,12 @@ rec_loop:
|
|||
err = sel_set_rec_lock(rec, index,
|
||||
prebuilt->select_lock_type,
|
||||
LOCK_GAP, thr);
|
||||
if (err != DB_SUCCESS) {
|
||||
|
||||
goto lock_wait_or_error;
|
||||
}
|
||||
}
|
||||
|
||||
if (err != DB_SUCCESS) {
|
||||
|
||||
goto lock_wait_or_error;
|
||||
}
|
||||
}
|
||||
|
||||
btr_pcur_store_position(pcur, &mtr);
|
||||
|
@ -3446,12 +3446,12 @@ rec_loop:
|
|||
err = sel_set_rec_lock(rec, index,
|
||||
prebuilt->select_lock_type,
|
||||
LOCK_GAP, thr);
|
||||
if (err != DB_SUCCESS) {
|
||||
|
||||
goto lock_wait_or_error;
|
||||
}
|
||||
}
|
||||
|
||||
if (err != DB_SUCCESS) {
|
||||
|
||||
goto lock_wait_or_error;
|
||||
}
|
||||
}
|
||||
|
||||
btr_pcur_store_position(pcur, &mtr);
|
||||
|
|
Loading…
Reference in a new issue