Skip to content

Commit 973df9e

Browse files
committed
Bug#31584093 CLIENT PLUGINS NOT INSTALLED AFTER INSTALLING MYSQL CLIENT LIBRARY FROM RPM/DEB
Create new subpackage client-plugins to hold client side plugins, this way client, libs or connectors can get client plugins as needed. Now Connector-cpp has been modified to depend on this client-plugins package.
1 parent 8e0b913 commit 973df9e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

packaging/deb-in/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,16 @@ IF (DEB_PRODUCT STREQUAL "commercial")
4747
SET (DEB_PRODUCTNAME "-commercial")
4848
SET (DEB_LICENSENAME "Commercial")
4949
SET (DEB_VERSION "+commercial-1")
50+
SET (DEB_SERVERPRODUCT "commercial")
5051
ELSE()
5152
SET (DEB_COPYRIGHT_UPSTREAMNAME "MySQL ${MYSQL_BASE_VERSION}")
5253
SET (DEB_PRODUCTNAME "")
5354
SET (DEB_LICENSENAME "GPL")
5455
SET (DEB_VERSION "-1")
56+
SET (DEB_SERVERPRODUCT "community")
5557
ENDIF()
5658

5759

58-
5960
# Platform specifics. The differences are generally only distro name used in version string
6061
IF(DEB_CODENAME STREQUAL "stretch")
6162
SET (DEB_PLATFORMRELEASE "debian9")

packaging/deb-in/control.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Section: libs
1212
Pre-Depends: ${misc:Pre-Depends}
1313
Multi-Arch: same
1414
Depends: ${shlibs:Depends}, ${misc:Depends},
15-
mysql@DEB_PRODUCTNAME@-client-plugins,
15+
mysql-@DEB_SERVERPRODUCT@-client-plugins,
1616
Description: MySQL database connector for C++
1717
A C++ interface for communicating with MySQL servers.
1818

0 commit comments

Comments
 (0)