Fix a trivial (and harmless) merge error

734029fa · Sergei Petrunia · 835f49d9 · 734029fa
Commit 734029fa authored Dec 26, 2018 by Sergei Petrunia
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

storage/rocksdb/ha_rocksdb.cc storage/rocksdb/ha_rocksdb.cc +0 -1

No files found.
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/storage/rocksdb/ha_rocksdb.cc
@@ -3770,7 +3770,6 @@ static int rocksdb_commit(handlerton* hton, THD* thd, bool commit_tx)
        We get here when committing a statement within a transaction.
      */
      tx->make_stmt_savepoint_permanent();
-      tx->make_stmt_savepoint_permanent();
    }

    if (my_core::thd_tx_isolation(thd) <= ISO_READ_COMMITTED) {