Skip to content

Commit cad33de

Browse files
committed
MDEV-30344: Without wsrep needs wsrep{,_on}.h headers
In the Develop package because of their use from sql_class.h which is the main file for THD needed by server plugins.
1 parent d0a534d commit cad33de

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

include/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ FOREACH(f ${HEADERS_GEN_CONFIGURE})
7777
ENDFOREACH(f)
7878
IF(NOT WITH_WSREP)
7979
SET(EXCL_SERVICE_WSREP "service_wsrep.h")
80-
SET(EXCL_WSREP "wsrep.h")
8180
ENDIF()
8281
INSTALL(DIRECTORY mysql/
8382
DESTINATION ${INSTALL_INCLUDEDIR}/server/mysql COMPONENT Development
@@ -94,7 +93,6 @@ MACRO(INSTALL_PRIVATE DIR)
9493
FILES_MATCHING PATTERN "*.h"
9594
PATTERN CMakeFiles EXCLUDE
9695
PATTERN mysql EXCLUDE
97-
PATTERN "${EXCL_WSREP}" EXCLUDE
9896
REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
9997
ENDMACRO()
10098

sql/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ IF(WIN32)
496496
ENDIF(WIN32)
497497

498498
IF(NOT WITH_WSREP)
499-
SET(EXCL_WSREP "wsrep*.h")
499+
SET(EXCL_WSREP "wsrep_[a-np-z]*.h")
500500
ENDIF()
501501
INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
502502
FILES_MATCHING PATTERN "*.h"

0 commit comments

Comments
 (0)