diff --git a/src/tests/test_transactional_descriptor.cc b/src/tests/test_transactional_descriptor.cc index 0bf83716757..97d6f12bbcb 100644 --- a/src/tests/test_transactional_descriptor.cc +++ b/src/tests/test_transactional_descriptor.cc @@ -166,7 +166,6 @@ static void run_test(void) { { int chk_r = db->change_descriptor(db, txn_create, &change_descriptor, 0); CKERR(chk_r); } // test some error cases IN_TXN_COMMIT(env, txn_create, txn_create2, 0, { - { int chk_r = db->change_descriptor(db, txn_create2, &change_descriptor, 0); CKERR2(chk_r, EINVAL); } { int chk_r = db->change_descriptor(db, txn_create, &change_descriptor, 0); CKERR2(chk_r, EINVAL); } }); assert_desc_four(db); diff --git a/src/ydb_db.cc b/src/ydb_db.cc index 5f35217159d..6e17089ffa5 100644 --- a/src/ydb_db.cc +++ b/src/ydb_db.cc @@ -481,10 +481,6 @@ toku_db_change_descriptor(DB *db, DB_TXN* txn, const DBT* descriptor, uint32_t f r = EINVAL; goto cleanup; } - if (txn && txn->parent != NULL) { - r = EINVAL; // cannot have a parent if you are a resetting op - goto cleanup; - } // For a hot index, this is an initial descriptor. // We do not support (yet) hcad with hot index concurrently on a single table, which // would require changing a descriptor for a hot index.