Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1

into hundin.mysql.fi:/home/heikki/mysql-4.1

innobase/row/row0sel.c

@@ -3305,13 +3305,13 @@ 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;
 				}
 			}
+
+		}
 		/* A page supremum record cannot be in the result set: skip
 		it now that we have placed a possible lock on it */
 		
@@ -3413,14 +3413,14 @@ 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;
 					}
 				}
 
+			}
+
 			btr_pcur_store_position(pcur, &mtr);
 
 			ret = DB_RECORD_NOT_FOUND;
@@ -3446,14 +3446,14 @@ 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;
 					}
 				}
 
+			}
+
 			btr_pcur_store_position(pcur, &mtr);
 
 			ret = DB_RECORD_NOT_FOUND;