]> git.sur5r.net Git - openldap/commitdiff
Fix bad merge
authorHoward Chu <hyc@openldap.org>
Mon, 5 Sep 2011 23:15:36 +0000 (16:15 -0700)
committerHoward Chu <hyc@openldap.org>
Mon, 5 Sep 2011 23:15:36 +0000 (16:15 -0700)
libraries/libmdb/mdb.c

index 73d3eaa290bb6865e3be9895f2c2a9dcdfab8c58..7e77026bd22255c696804b95869fe3adbff99ba9 100644 (file)
@@ -2580,17 +2580,6 @@ set1:
                                rc = cursor->mc_txn->mt_dbxs[cursor->mc_dbi].md_cmp(key, &nodekey);
                                if (rc <= 0) goto set1;
                        }
-                       /* If any parents have right-sibs, search.
-                        * Otherwise, there's nothing further.
-                        */
-                       for (i=0; i<cursor->mc_snum-1; i++)
-                               if (cursor->mc_stack[i].mp_ki <
-                                       NUMKEYS(cursor->mc_stack[i].mp_page)-1)
-                                       break;
-                       if (i == cursor->mc_snum - 1) {
-                               /* There are no other pages */
-                               goto set1;
-                       }
                        /* If any parents have right-sibs, search.
                         * Otherwise, there's nothing further.
                         */