mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into releases/tokudb-7.5

Browse source
This commit is contained in:
Rich Prohaska 2014-11-05 09:28:29 -05:00
commit a9e5093e93
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/tokudb.bugs/t/5585.test
View file

@ -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;

2
storage/tokudb/hatoku_hton.cc
View file

@ -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;