[t:4541], fix a couple of other tests

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

src/tests/recover-upgrade-db-descriptor-multihandle.c

@@ -19,12 +19,12 @@ uint32_t forced_version = 2;
 
 static int my_compare(DB *UU(db), const DBT *a, const DBT *b) {
     assert(db);
-    assert(db->descriptor);
+    assert(db->cmp_descriptor);
     uint32_t which = forced_version-1;
     size_t len = strlen(descriptor_contents[which])+1;
 
-    assert(db->descriptor->dbt.size == len);
-    assert(memcmp(db->descriptor->dbt.data, descriptor_contents[which], len) == 0);
+    assert(db->cmp_descriptor->dbt.size == len);
+    assert(memcmp(db->cmp_descriptor->dbt.data, descriptor_contents[which], len) == 0);
 
     assert(a->size == b->size);
     verified = 1;

src/tests/recover-upgrade-db-descriptor.c

@@ -23,8 +23,8 @@ static int my_compare(DB *UU(db), const DBT *a, const DBT *b) {
     uint32_t which = forced_version-1;
     size_t len = strlen(descriptor_contents[which])+1;
 
-    assert(db->descriptor->dbt.size == len);
-    assert(memcmp(db->descriptor->dbt.data, descriptor_contents[which], len) == 0);
+    assert(db->cmp_descriptor->dbt.size == len);
+    assert(memcmp(db->cmp_descriptor->dbt.data, descriptor_contents[which], len) == 0);
 
     assert(a->size == b->size);
     verified = 1;