diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-01-03 13:09:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-01-03 13:09:41 +0100 |
| commit | 6bb11efa4a7ba813eb4aa2548f95b7297d70f3d7 (patch) | |
| tree | 3c2dfb2dfbbb0a2471bdcfb0f0c122f823cc80ab /storage/rocksdb | |
| parent | ab4bc8442094a2be8cdb74bfcddfccede81ac03d (diff) | |
| parent | 842402e4df35c230e7a416ce3ef8df3055f03d60 (diff) | |
| download | mariadb-git-6bb11efa4a7ba813eb4aa2548f95b7297d70f3d7.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage/rocksdb')
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 1 | ||||
| -rwxr-xr-x | storage/rocksdb/myrocks_hotbackup.py (renamed from storage/rocksdb/myrocks_hotbackup) | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 090763a2ece..6bb8c9f6d67 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -221,7 +221,9 @@ TARGET_LINK_LIBRARIES(sst_dump rocksdblib) MYSQL_ADD_EXECUTABLE(mysql_ldb tools/mysql_ldb.cc COMPONENT rocksdb-engine) TARGET_LINK_LIBRARIES(mysql_ldb rocksdb_tools rocksdb_aux_lib dbug) -INSTALL_SCRIPT(myrocks_hotbackup COMPONENT rocksdb-engine) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/myrocks_hotbackup.py + ${CMAKE_CURRENT_BINARY_DIR}/myrocks_hotbackup @ONLY) +INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/myrocks_hotbackup COMPONENT rocksdb-engine) IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") SET_TARGET_PROPERTIES(rocksdb_tools sst_dump mysql_ldb PROPERTIES COMPILE_FLAGS -frtti) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 98ce1180d48..f09e263fe75 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) { diff --git a/storage/rocksdb/myrocks_hotbackup b/storage/rocksdb/myrocks_hotbackup.py index ef1e934f3fd..69c75b7cbfd 100755 --- a/storage/rocksdb/myrocks_hotbackup +++ b/storage/rocksdb/myrocks_hotbackup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!@PYTHON_SHEBANG@ from __future__ import division from optparse import OptionParser |