diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-12-02 12:50:40 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-12-02 12:50:40 +0100 |
| commit | 1ac806ea246a38f09486acb317f4dd149daa064f (patch) | |
| tree | 1a11069a6d9ba079bc48a5d10f260e49a8b16170 /sql/handler.cc | |
| parent | 55d0b6cc6fa4216192f29a55a93188bd0fbb2e02 (diff) | |
| parent | d5cac14e749fac9719341dd1779522db2aeaf5f4 (diff) | |
| download | mariadb-git-1ac806ea246a38f09486acb317f4dd149daa064f.tar.gz | |
Merge PBXT 1.0.09f RC3 into MariaDB.
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 28d5914a1d3..198522f2e56 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1584,16 +1584,6 @@ int ha_recover(HASH *commit_list) if (info.commit_list) sql_print_information("Starting crash recovery..."); -#ifndef WILL_BE_DELETED_LATER - /* - for now, only InnoDB supports 2pc. It means we can always safely - rollback all pending transactions, without risking inconsistent data - */ - DBUG_ASSERT(total_ha_2pc == (ulong) opt_bin_log+1); // only InnoDB and binlog - tc_heuristic_recover= TC_HEURISTIC_RECOVER_ROLLBACK; // forcing ROLLBACK - info.dry_run=FALSE; -#endif - for (info.len= MAX_XID_LIST_SIZE ; info.list==0 && info.len > MIN_XID_LIST_SIZE; info.len/=2) { |