From 44bc2a0ef71b034a0efea13cde96033743a69651 Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Sun, 2 Apr 2017 23:38:28 +0300 Subject: [PATCH] Post-fixes for "Rename plugin rocksdb_se to rocksdb" - Also rename plugin's config file - And fix unit test's CMakeLists.txt --- debian/mariadb-plugin-rocksdb.install | 2 +- storage/rocksdb/unittest/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install index 5e3b5772fc7bf..ee45a822e0c42 100644 --- a/debian/mariadb-plugin-rocksdb.install +++ b/debian/mariadb-plugin-rocksdb.install @@ -1,4 +1,4 @@ -etc/mysql/conf.d/rocksdb_se.cnf etc/mysql/mariadb.conf.d +etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d usr/lib/mysql/plugin/ha_rocksdb.so usr/bin/mysql_ldb usr/bin/sst_dump diff --git a/storage/rocksdb/unittest/CMakeLists.txt b/storage/rocksdb/unittest/CMakeLists.txt index d2a5ea2aff7e1..de8d0d82aead3 100644 --- a/storage/rocksdb/unittest/CMakeLists.txt +++ b/storage/rocksdb/unittest/CMakeLists.txt @@ -1,4 +1,4 @@ -IF (WITH_ROCKSDB_SE_STORAGE_ENGINE) +IF (TARGET rocksdb) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/unittest/mytap ${CMAKE_SOURCE_DIR}/rocksdb/third-party/gtest-1.7.0/fused-src