From 46ea51ff77717a79cdb75482dcc3040fa263aa20 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Sat, 23 Nov 2013 13:05:35 +0100
Subject: [PATCH] tokudb post-merge compilation fixes

---
 storage/tokudb/ha_tokudb.cc   | 2 +-
 storage/tokudb/hatoku_hton.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc
index ec74a787935..bf0322b2536 100644
--- a/storage/tokudb/ha_tokudb.cc
+++ b/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);
         }
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc
index ef9b130a675..73af044b603 100644
--- a/storage/tokudb/hatoku_hton.cc
+++ b/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; }        
     }