Addresses #1603 Rollback of a bug introduced.

Do not compare idx and index in remove_txn and remove_brt.  idx is from the iterating OMT and index is from the other OMT.
There is no reason they should match, therefore do not assert that they should

git-svn-id: file:///svn/toku/tokudb@11164 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/log.c

@@ -1134,7 +1134,7 @@ int toku_txn_note_brt (TOKUTXN txn, BRT brt) {
     return 0;
 }
 
-static int remove_brt (OMTVALUE txnv, u_int32_t idx, void *brtv) {
+static int remove_brt (OMTVALUE txnv, u_int32_t UU(idx), void *brtv) {
     TOKUTXN txn = txnv;
     BRT     brt = brtv;
     OMTVALUE brtv_again=NULL;
@@ -1142,7 +1142,6 @@ static int remove_brt (OMTVALUE txnv, u_int32_t idx, void *brtv) {
     int r = toku_omt_find_zero(txn->open_brts, find_filenum, brt, &brtv_again, &index, NULL);
     assert(r==0);
     assert((void*)brtv_again==brtv);
-    assert(index==idx);
     r = toku_omt_delete_at(txn->open_brts, index);
     assert(r==0);
     return 0;
@@ -1154,7 +1153,7 @@ int toku_txn_note_close_brt (BRT brt) {
     return 0;
 }
 
-static int remove_txn (OMTVALUE brtv, u_int32_t idx, void *txnv) {
+static int remove_txn (OMTVALUE brtv, u_int32_t UU(idx), void *txnv) {
     BRT brt     = brtv;
     TOKUTXN txn = txnv;
     OMTVALUE txnv_again=NULL;
@@ -1162,7 +1161,6 @@ static int remove_txn (OMTVALUE brtv, u_int32_t idx, void *txnv) {
     int r = toku_omt_find_zero(brt->txns, find_xid, txn, &txnv_again, &index, NULL);
     assert(r==0);
     assert((void*)txnv_again==txnv);
-    assert(index==idx);
     r = toku_omt_delete_at(brt->txns, index);
     assert(r==0);
     return 0;