The fix is to #687 is that the latest value from a le_both was providing the...

The fix is to #687 is that the latest value from a le_both was providing the committed value rather than the provisional value. Fixes #687

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

newbrt/brt.c

@@ -1124,10 +1124,10 @@ int leafval_bessel_le_committed (u_int32_t klen, void *kval,
 
 int leafval_bessel_le_both (TXNID xid __attribute__((__unused__)),
 			    u_int32_t klen, void *kval,
-			    u_int32_t clen, void *cval,
-			    u_int32_t plen __attribute__((__unused__)), void *pval __attribute__((__unused__)),
+			    u_int32_t clen __attribute__((__unused__)), void *cval __attribute__((__unused__)),
+			    u_int32_t plen, void *pval,
 			    struct cmd_leafval_bessel_extra *be) {
-    return leafval_bessel_le_committed(klen, kval, clen, cval, be);
+    return leafval_bessel_le_committed(klen, kval, plen, pval, be);
 }
 
 int leafval_bessel_le_provdel (TXNID xid __attribute__((__unused__)),

newbrt/leafentry.c

@@ -532,8 +532,8 @@ u_int32_t le_latest_keylen (LEAFENTRY le) {
 void* latest_val_le_committed (u_int32_t UU(keylen), void *UU(key), u_int32_t UU(vallen), void *UU(val)) {
     return val;
 }
-void* latest_val_le_both (TXNID UU(xid), u_int32_t UU(klen), void *UU(kval), u_int32_t UU(clen), void *cval, u_int32_t UU(plen), void *UU(pval)) {
-    return cval;
+void* latest_val_le_both (TXNID UU(xid), u_int32_t UU(klen), void *UU(kval), u_int32_t UU(clen), void *UU(cval), u_int32_t UU(plen), void *pval) {
+    return pval;
 }
 void* latest_val_le_provdel (TXNID UU(xid), u_int32_t UU(klen), void *UU(kval), u_int32_t UU(clen), void *UU(cval)) {
     return 0; // for provisional delete, there is no *latest* key, so return NULL