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

tokudb post-merge compilation fixes

Browse source
This commit is contained in:
Sergei Golubchik 2013-11-23 13:05:35 +01:00
parent c6d30805db
commit 46ea51ff77
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/tokudb/ha_tokudb.cc
View file

@ -7250,7 +7250,7 @@ cleanup:
int r = status_db->close(status_db, 0); int r = status_db->close(status_db, 0);
assert(r==0); assert(r==0);
} }
if (txn && do_commit) { if (txn) {
if (error) { if (error) {
abort_txn(txn); abort_txn(txn);
} }

2
storage/tokudb/hatoku_hton.cc
View file

@ -939,7 +939,7 @@ static int tokudb_discover3(handlerton *hton, THD* thd, const char *db, const ch
} }
else { else {
do_commit = true; do_commit = true;
error = txn_begin(db_env, 0, &txn, thd); error = txn_begin(db_env, 0, &txn, 0, thd);
if (error) { goto cleanup; } if (error) { goto cleanup; }
} }