diff --git a/storage/tokudb/hatoku_defines.h b/storage/tokudb/hatoku_defines.h
index a24aade6bb8..fcaeb2e4118 100644
--- a/storage/tokudb/hatoku_defines.h
+++ b/storage/tokudb/hatoku_defines.h
@@ -161,7 +161,7 @@ PATENT RIGHTS GRANT:
 #if defined(MARIADB_BASE_VERSION)
 #define TOKU_INCLUDE_EXTENDED_KEYS 1
 #endif
-#define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 1
+#define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 0
 
 #else
 #error
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc
index ad80b85e831..276fc096d3f 100644
--- a/storage/tokudb/hatoku_hton.cc
+++ b/storage/tokudb/hatoku_hton.cc
@@ -969,7 +969,7 @@ static int tokudb_discover3(handlerton *hton, THD* thd, const char *db, const ch
     HA_METADATA_KEY curr_key = hatoku_frm_data;
     DBT key = {};
     DBT value = {};
-    bool do_commit;
+    bool do_commit = false;
 
 #if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
     tokudb_trx_data *trx = (tokudb_trx_data *) thd_get_ha_data(thd, tokudb_hton);