Merge branch 'master' into releases/tokudb-7.5

mysql-test/suite/tokudb.bugs/t/5585.test

 --source include/have_innodb.inc
 --source include/have_tokudb.inc
+--source include/big_test.inc
 
 --disable_warnings
 drop table if exists t1, t2;

storage/tokudb/hatoku_hton.cc

@@ -625,8 +625,8 @@ int tokudb_end(handlerton * hton, ha_panic_function type) {
     if (db_env) {
         if (tokudb_init_flags & DB_INIT_LOG)
             tokudb_cleanup_log_files();
-#if TOKU_INCLUDE_XA
         long total_prepared = 0; // count the total number of prepared txn's that we discard
+#if TOKU_INCLUDE_XA
         while (1) {
             // get xid's 
             const long n_xid = 1;