diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-17 19:04:08 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-17 19:04:08 +0200 |
| commit | bf106948e080887d2398e3694d50a705d15d006f (patch) | |
| tree | 10a178d1a11fd5d3b540d48d6807d06a805f106c | |
| parent | ee9afef27141f55165009fdbd58e54942f3a6867 (diff) | |
| download | mariadb-git-bf106948e080887d2398e3694d50a705d15d006f.tar.gz | |
RPM fixes:
shared should provide libmysqlclient.so.18(libmysqlclient_16) too
don't "use DBD::mysql" explicitly in mytop
| -rw-r--r-- | cmake/cpack_rpm.cmake | 2 | ||||
| -rwxr-xr-x | scripts/mytop.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index d3a9eb6841f..f5017d6c984 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -89,7 +89,7 @@ SET(CPACK_RPM_server_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/ SET(CPACK_RPM_server_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postun.sh) SET(CPACK_RPM_shared_PACKAGE_OBSOLETES "mysql-shared MySQL-shared-standard MySQL-shared-pro MySQL-shared-pro-cert MySQL-shared-pro-gpl MySQL-shared-pro-gpl-cert MySQL-shared MySQL-OurDelta-shared") -SET(CPACK_RPM_shared_PACKAGE_PROVIDES "MariaDB-shared MySQL-shared mysql-shared libmysqlclient.so.${SHARED_LIB_MAJOR_VERSION} libmysqlclient.so.${SHARED_LIB_MAJOR_VERSION}(libmysqlclient_${SHARED_LIB_MAJOR_VERSION}) libmysqlclient_r.so.${SHARED_LIB_MAJOR_VERSION} libmysqlclient_r.so.${SHARED_LIB_MAJOR_VERSION}(libmysqlclient_${SHARED_LIB_MAJOR_VERSION})") +SET(CPACK_RPM_shared_PACKAGE_PROVIDES "MariaDB-shared MySQL-shared mysql-shared libmysqlclient.so.18 libmysqlclient.so.18(libmysqlclient_16) libmysqlclient.so.18(libmysqlclient_18) libmysqlclient_r.so.18 libmysqlclient_r.so.18(libmysqlclient_18)") SET(CPACK_RPM_shared_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh) SET(CPACK_RPM_shared_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh) diff --git a/scripts/mytop.sh b/scripts/mytop.sh index f0456498da7..480805e90b1 100755 --- a/scripts/mytop.sh +++ b/scripts/mytop.sh @@ -15,7 +15,6 @@ mytop - display MySQL server performance info like `top' use 5.005; use strict; use DBI; -use DBD::mysql; use Getopt::Long; use Socket; use List::Util qw(min max); |