diff options
author | unknown <heikki@hundin.mysql.fi> | 2005-04-13 15:49:28 +0300 |
---|---|---|
committer | unknown <heikki@hundin.mysql.fi> | 2005-04-13 15:49:28 +0300 |
commit | 880d0295d6655f1f9b64c8943484e813d009fe38 (patch) | |
tree | 18ec01bea969f081f69781fd57c166c12f63f066 /innobase | |
parent | dec90f5b36f3977849009031fcd6b1891c08a884 (diff) | |
download | mariadb-git-880d0295d6655f1f9b64c8943484e813d009fe38.tar.gz |
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()
innobase/row/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()
Diffstat (limited to 'innobase')
-rw-r--r-- | innobase/row/row0sel.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index eb88ac31ba9..f8218e08297 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -3305,12 +3305,12 @@ rec_loop: err = sel_set_rec_lock(rec, index, prebuilt->select_lock_type, LOCK_ORDINARY, thr); - } - - if (err != DB_SUCCESS) { + if (err != DB_SUCCESS) { - goto lock_wait_or_error; + 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) { + if (err != DB_SUCCESS) { - goto lock_wait_or_error; + 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) { - if (err != DB_SUCCESS) { - - goto lock_wait_or_error; + goto lock_wait_or_error; + } } + } btr_pcur_store_position(pcur, &mtr); |