tokudb post-merge compilation fixes

storage/tokudb/ha_tokudb.cc

@@ -7250,7 +7250,7 @@ cleanup:
         int r = status_db->close(status_db, 0);
         assert(r==0);
     }
-    if (txn && do_commit) {
+    if (txn) {
         if (error) {
             abort_txn(txn);
         }

storage/tokudb/hatoku_hton.cc

@@ -939,7 +939,7 @@ static int tokudb_discover3(handlerton *hton, THD* thd, const char *db, const ch
     }
     else {
         do_commit = true;
-        error = txn_begin(db_env, 0, &txn, thd);
+        error = txn_begin(db_env, 0, &txn, 0, thd);
         if (error) { goto cleanup; }        
     }