diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2018-12-26 00:00:49 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2018-12-26 00:00:49 +0300 |
| commit | 734029fa7960d54d9c50adfca4ac6739a4ea0347 (patch) | |
| tree | 82ffe8697119cf4688eb3d67ac678ffddac47c82 | |
| parent | 835f49d9ce11ba5166da15409f7f75dcf7b5252d (diff) | |
| download | mariadb-git-734029fa7960d54d9c50adfca4ac6739a4ea0347.tar.gz | |
Fix a trivial (and harmless) merge error
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 4a1f19f45de..a6689f7707f 100644 --- 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) { |