Skip to content

Commit

Permalink
Fix static MyRocks library linkage error with gcc
Browse files Browse the repository at this point in the history
Upstream commit ID: facebook/mysql-5.6@c75bf30
PS-8755: Merge percona-202301 (https://jira.percona.com/browse/PS-8755)

Summary:
Commit 8a8708b71da379daea13fcae90e3bb1af5d60f32
(MyRocks to support both dynamic and static plugins) caused
compiler error on Ubuntu 22.04 with gcc (Issue percona#1262).
This diff fixes it.

squash with: D41313174

Reviewed By: lth

Differential Revision: D42646920

fbshipit-source-id: 16e77bc5b0cbcc464be7ce587b37da78b4b3de8f
  • Loading branch information
Yoshinori Matsunobu authored and inikep committed Oct 26, 2023
1 parent 9181c7f commit 06d48cc
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions storage/rocksdb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,8 @@ IF (ROCKSDB_DYNAMIC_PLUGIN)
ELSE()
MYSQL_ADD_PLUGIN(rocksdb_se ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT
STATIC_ONLY LINK_LIBRARIES ${rocksdb_static_libs})
# to fix linkage error on partition_base
TARGET_LINK_LIBRARIES(rocksdb_se sql_main)
ENDIF()

IF (NOT HAVE_EXTERNAL_ROCKSDB)
Expand Down

0 comments on commit 06d48cc

Please sign in to comment.