[Commits] 7d580ad1417: MDEV-19936: MyRocks: compile fails on Windows

Sergei Petrunia psergey at askmonty.org
Wed Jul 3 10:58:40 EEST 2019


revision-id: 7d580ad141764e3751922ac9d349ae92ac6dc409 (mariadb-10.3.16-21-g7d580ad1417)
parent(s): 1d45b3b055511d58c1e820ad497793f30871586e
author: Sergei Petrunia
committer: Sergei Petrunia
timestamp: 2019-07-03 10:58:40 +0300
message:

MDEV-19936: MyRocks: compile fails on Windows

Don't compile table/mock_table.cc
(pushing this patch to 10.3 first to make sure it fixes the issue
will push to 10.2, too)

---
 storage/rocksdb/build_rocksdb.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
index 561e6cdefe6..22ec9f324f6 100644
--- a/storage/rocksdb/build_rocksdb.cmake
+++ b/storage/rocksdb/build_rocksdb.cmake
@@ -171,7 +171,10 @@ set(LIBS ${ROCKSDB_LIBS} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
 #add_subdirectory(${ROCKSDB_SOURCE_DIR}/tools)
 
 # Main library source code
-
+#  Note : table/mock_table.cc must not be in the below list as it causes
+#   compile warnings-treated-as-errors on Windows, and it is only used in
+#   RocksDB's tests.
+#
 set(ROCKSDB_SOURCES
         cache/clock_cache.cc
         cache/lru_cache.cc
@@ -298,7 +301,6 @@ set(ROCKSDB_SOURCES
         table/iterator.cc
         table/merging_iterator.cc
         table/meta_blocks.cc
-        table/mock_table.cc
         table/persistent_cache_helper.cc
         table/plain/plain_table_builder.cc
         table/plain/plain_table_factory.cc


More information about the commits mailing list