revision-id: a7e5049fec3d938dd19df82c3db047a2a0d9119f parent(s): 959362c0208c545af8047fa690a439c39290e138 committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-17 11:10:11 +0300 message: MyRocks: Fix link error on Windows rocksdb_aux_lib.lib(rdb_sst_info.obj) : error LNK2001: unresolved external symbol PSI_server [D:\winx64-packages\build\storage\rocksdb\rocksdb.vcxproj] rocksdb_aux_lib is an utility library used by standalone tools. These won't have PSI_server. FIxed by moving rdb_sst_info.* out of the library (as they do not seem to be used by these standalone tools) --- storage/rocksdb/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index d5e9b19..953854d 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -95,6 +95,8 @@ SET(ROCKSDB_SE_SOURCES rdb_threads.h rdb_psi.h rdb_psi.cc + rdb_sst_info.cc + rdb_sst_info.h ) # MariaDB: the following is added in build_rocksdb.cmake, when appropriate: @@ -137,8 +139,6 @@ ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib event_listener.h rdb_perf_context.cc rdb_perf_context.h - rdb_sst_info.cc - rdb_sst_info.h rdb_buff.h rdb_mariadb_port.h )