From 18951c10fa4d667879e474ef5650a557496c34b1 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Mon, 3 Nov 2014 15:03:57 -0500 Subject: [PATCH 1/2] mark 5585.test as a big test --- mysql-test/suite/tokudb.bugs/t/5585.test | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/tokudb.bugs/t/5585.test b/mysql-test/suite/tokudb.bugs/t/5585.test index faf2dd48d80..98fc88e24d1 100644 --- a/mysql-test/suite/tokudb.bugs/t/5585.test +++ b/mysql-test/suite/tokudb.bugs/t/5585.test @@ -1,5 +1,6 @@ --source include/have_innodb.inc --source include/have_tokudb.inc +--source include/big_test.inc --disable_warnings drop table if exists t1, t2; From 64560d816ea6435cea65563f76a219105f7c3b54 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Wed, 5 Nov 2014 04:15:43 -0500 Subject: [PATCH 2/2] DB-730 build tokudb without XA --- storage/tokudb/hatoku_hton.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc index eb625231a19..903d15c7969 100644 --- a/storage/tokudb/hatoku_hton.cc +++ b/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;