From a0107d9c1d4cc88ea5831c2cd38d6fe3db91c290 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 28 Jul 2015 00:05:42 +0200 Subject: [PATCH] MDEV-8296 MSVS 2013 & WiX 3.9 removed unused directory --- CMakeLists.txt | 2 - packaging/WiX/AdminBackground.jpg | Bin 20557 -> 0 bytes packaging/WiX/AdminHeader.jpg | Bin 3469 -> 0 bytes packaging/WiX/CMakeLists.txt | 119 -- packaging/WiX/CPackWixConfig.cmake | 119 -- packaging/WiX/MySQLServer.ico | Bin 22486 -> 0 bytes packaging/WiX/ca/CMakeLists.txt | 55 - packaging/WiX/ca/CustomAction.cpp | 188 -- packaging/WiX/ca/CustomAction.def | 8 - packaging/WiX/create_msi.cmake.in | 398 ---- packaging/WiX/custom_ui.wxs | 115 -- packaging/WiX/extra.wxs.in | 81 - packaging/WiX/mysql_server.wxs.in | 196 -- packaging/rpm-oel/CMakeLists.txt | 36 - packaging/rpm-oel/filter-provides.sh | 6 - packaging/rpm-oel/filter-requires.sh | 6 - packaging/rpm-oel/my.cnf | 31 - packaging/rpm-oel/my_config.h | 30 - .../mysql-5.5-libmysqlclient-symbols.patch | 982 ---------- packaging/rpm-oel/mysql-systemd-start | 68 - packaging/rpm-oel/mysql.conf | 1 - packaging/rpm-oel/mysql.init | 213 -- packaging/rpm-oel/mysql.spec.in | 1714 ----------------- packaging/rpm-oel/mysql_config.sh | 28 - packaging/rpm-oel/mysqld.service | 48 - packaging/solaris/CMakeLists.txt | 36 - packaging/solaris/postinstall-solaris.sh | 123 -- 27 files changed, 4603 deletions(-) delete mode 100644 packaging/WiX/AdminBackground.jpg delete mode 100644 packaging/WiX/AdminHeader.jpg delete mode 100644 packaging/WiX/CMakeLists.txt delete mode 100644 packaging/WiX/CPackWixConfig.cmake delete mode 100644 packaging/WiX/MySQLServer.ico delete mode 100644 packaging/WiX/ca/CMakeLists.txt delete mode 100644 packaging/WiX/ca/CustomAction.cpp delete mode 100644 packaging/WiX/ca/CustomAction.def delete mode 100644 packaging/WiX/create_msi.cmake.in delete mode 100644 packaging/WiX/custom_ui.wxs delete mode 100644 packaging/WiX/extra.wxs.in delete mode 100644 packaging/WiX/mysql_server.wxs.in delete mode 100644 packaging/rpm-oel/CMakeLists.txt delete mode 100755 packaging/rpm-oel/filter-provides.sh delete mode 100755 packaging/rpm-oel/filter-requires.sh delete mode 100644 packaging/rpm-oel/my.cnf delete mode 100644 packaging/rpm-oel/my_config.h delete mode 100644 packaging/rpm-oel/mysql-5.5-libmysqlclient-symbols.patch delete mode 100644 packaging/rpm-oel/mysql-systemd-start delete mode 100644 packaging/rpm-oel/mysql.conf delete mode 100644 packaging/rpm-oel/mysql.init delete mode 100644 packaging/rpm-oel/mysql.spec.in delete mode 100644 packaging/rpm-oel/mysql_config.sh delete mode 100644 packaging/rpm-oel/mysqld.service delete mode 100644 packaging/solaris/CMakeLists.txt delete mode 100644 packaging/solaris/postinstall-solaris.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index b274f80b7734e..0adbb85d431a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -424,7 +424,6 @@ IF(NOT WITHOUT_SERVER) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() - ADD_SUBDIRECTORY(packaging/rpm-oel) ENDIF() IF(UNIX) @@ -438,7 +437,6 @@ IF(WIN32) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() -ADD_SUBDIRECTORY(packaging/solaris) IF(NOT CMAKE_CROSSCOMPILING) SET(EXPORTED comp_err comp_sql factorial) diff --git a/packaging/WiX/AdminBackground.jpg b/packaging/WiX/AdminBackground.jpg deleted file mode 100644 index 847dc6cdbede91dbbd4049492de464d095585e08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20557 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 Tra}LqcTbp?{S4JJ*M$E8j%h+9 diff --git a/packaging/WiX/AdminHeader.jpg b/packaging/WiX/AdminHeader.jpg deleted file mode 100644 index 6e2e33d404f0d954ba6a852422d4f4721740e989..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3469 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") - ENDIF() - ENDFOREACH() - STRING(TOUPPER ${dir} DIR_UPPER) - SET(DATADIR_${DIR_UPPER}_FILES "${filelist}") -ENDFOREACH() - - -FIND_PROGRAM(HEAT_EXECUTABLE heat ${WIX_DIR}) -FIND_PROGRAM(CANDLE_EXECUTABLE candle ${WIX_DIR}) -FIND_PROGRAM(LIGHT_EXECUTABLE light ${WIX_DIR}) - -# WiX wants the license text as rtf; if there is no rtf license, -# we create a fake one from the plain text COPYING file. -IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.rtf") - SET(COPYING_RTF "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.rtf") -ELSE() - IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.mysql") - SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.mysql") - ELSE() - SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../COPYING") - ENDIF() - FILE(READ ${LICENSE_FILE} CONTENTS) - STRING(REGEX REPLACE "\n" "\\\\par\n" CONTENTS "${CONTENTS}") - STRING(REGEX REPLACE "\t" "\\\\tab" CONTENTS "${CONTENTS}") - FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "{\\rtf1\\ansi\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Courier New;}}\\viewkind4\\uc1\\pard\\lang1031\\f0\\fs15") - FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "${CONTENTS}") - FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "\n}\n") - SET(COPYING_RTF "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf") -ENDIF() -GET_TARGET_PROPERTY(WIXCA_LOCATION wixca LOCATION) -SET(CPACK_WIX_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/CPackWixConfig.cmake) -SET(CPACK_WIX_INCLUDE "${CMAKE_CURRENT_BINARY_DIR}/extra.wxs;${CMAKE_CURRENT_SOURCE_DIR}/custom_ui.wxs") - -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/create_msi.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake - @ONLY) - - -IF(CMAKE_SIZEOF_VOID_P EQUAL 8) - SET(WixWin64 " Win64='yes'") -ELSE() - SET(WixWin64) -ENDIF() - -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/extra.wxs.in - ${CMAKE_CURRENT_BINARY_DIR}/extra.wxs) - -IF(CMAKE_GENERATOR MATCHES "Visual Studio") - SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_CFG_INTDIR}") -ENDIF() - - -ADD_CUSTOM_TARGET( - MSI - COMMAND set VS_UNICODE_OUTPUT= - COMMAND ${CMAKE_COMMAND} - ${CONFIG_PARAM} - -P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake -) -ADD_DEPENDENCIES(MSI wixca) - -ADD_CUSTOM_TARGET( - MSI_ESSENTIALS - COMMAND set VS_UNICODE_OUTPUT= - COMMAND ${CMAKE_COMMAND} -DESSENTIALS=1 - ${CONFIG_PARAM} - -P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake -) -ADD_DEPENDENCIES(MSI_ESSENTIALS wixca) - diff --git a/packaging/WiX/CPackWixConfig.cmake b/packaging/WiX/CPackWixConfig.cmake deleted file mode 100644 index 9caae8375d804..0000000000000 --- a/packaging/WiX/CPackWixConfig.cmake +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -IF(ESSENTIALS) - SET(CPACK_COMPONENTS_USED "Server;Client;DataFiles") - SET(CPACK_WIX_UI "WixUI_InstallDir") - IF(CMAKE_SIZEOF_VOID_P MATCHES 8) - SET(CPACK_PACKAGE_FILE_NAME "mysql-essential-${VERSION}-winx64") - ELSE() - SET(CPACK_PACKAGE_FILE_NAME "mysql-essential-${VERSION}-win32") - ENDIF() -ELSE() - SET(CPACK_COMPONENTS_USED - "Server;Client;DataFiles;Development;SharedLibraries;Documentation;IniFiles;Readme;Server_Scripts;DebugBinaries") -ENDIF() - - -# Some components like Embedded are optional -# We will build MSI without embedded if it was not selected for build -#(need to modify CPACK_COMPONENTS_ALL for that) -SET(CPACK_ALL) -FOREACH(comp1 ${CPACK_COMPONENTS_USED}) - SET(found) - FOREACH(comp2 ${CPACK_COMPONENTS_ALL}) - IF(comp1 STREQUAL comp2) - SET(found 1) - BREAK() - ENDIF() - ENDFOREACH() - IF(found) - SET(CPACK_ALL ${CPACK_ALL} ${comp1}) - ENDIF() -ENDFOREACH() -SET(CPACK_COMPONENTS_ALL ${CPACK_ALL}) - -# Always install (hidden), includes Readme files -SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1) -SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall") - -# Feature MySQL Server -SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MySQL Server") -SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_EXPANDED "1") -SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install MySQL Server") - # Subfeature "Server" (hidden) - SET(CPACK_COMPONENT_SERVER_GROUP "MySQLServer") - SET(CPACK_COMPONENT_SERVER_HIDDEN 1) - # Subfeature "Client" - SET(CPACK_COMPONENT_CLIENT_GROUP "MySQLServer") - SET(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client Programs") - SET(CPACK_COMPONENT_CLIENT_DESCRIPTION - "Various helpful (commandline) tools including the mysql command line client" ) - # Subfeature "Debug binaries" - SET(CPACK_COMPONENT_DEBUGBINARIES_GROUP "MySQLServer") - SET(CPACK_COMPONENT_DEBUGBINARIES_DISPLAY_NAME "Debug binaries") - SET(CPACK_COMPONENT_DEBUGBINARIES_DESCRIPTION - "Debug/trace versions of executables and libraries" ) - #SET(CPACK_COMPONENT_DEBUGBINARIES_WIX_LEVEL 2) - - - #Subfeature "Data Files" - SET(CPACK_COMPONENT_DATAFILES_GROUP "MySQLServer") - SET(CPACK_COMPONENT_DATAFILES_DISPLAY_NAME "Server data files") - SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" ) - SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1) - - -#Feature "Devel" -SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components") -SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and libraries") - #Subfeature "Development" - SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "Devel") - SET(CPACK_COMPONENT_DEVELOPMENT_HIDDEN 1) - - #Subfeature "Shared libraries" - SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "Devel") - SET(CPACK_COMPONENT_SHAREDLIBRARIES_DISPLAY_NAME "Client C API library (shared)") - SET(CPACK_COMPONENT_SHAREDLIBRARIES_DESCRIPTION "Installs shared client library") - - #Subfeature "Embedded" - SET(CPACK_COMPONENT_EMBEDDED_GROUP "Devel") - SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded server library") - SET(CPACK_COMPONENT_EMBEDDED_DESCRIPTION "Installs embedded server library") - SET(CPACK_COMPONENT_EMBEDDED_WIX_LEVEL 2) - -#Feature Debug Symbols -SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DISPLAY_NAME "Debug Symbols") -SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DESCRIPTION "Installs Debug Symbols") -SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_WIX_LEVEL 2) - SET(CPACK_COMPONENT_DEBUGINFO_GROUP "DebugSymbols") - SET(CPACK_COMPONENT_DEBUGINFO_HIDDEN 1) - -#Feature Documentation -SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation") -SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation") -SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2) - -#Feature tests -SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests") -SET(CPACK_COMPONENT_TEST_DESCRIPTION "Installs unittests (requires Perl to run)") -SET(CPACK_COMPONENT_TEST_WIX_LEVEL 2) - - -#Feature Misc (hidden, installs only if everything is installed) -SET(CPACK_COMPONENT_GROUP_MISC_HIDDEN 1) -SET(CPACK_COMPONENT_GROUP_MISC_WIX_LEVEL 100) - SET(CPACK_COMPONENT_INIFILES_GROUP "Misc") - SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "Misc") diff --git a/packaging/WiX/MySQLServer.ico b/packaging/WiX/MySQLServer.ico deleted file mode 100644 index a471afcda9525e3009b35019aeb245e0a4e10f3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22486 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 diff --git a/packaging/WiX/ca/CMakeLists.txt b/packaging/WiX/ca/CMakeLists.txt deleted file mode 100644 index 81622a1d158e7..0000000000000 --- a/packaging/WiX/ca/CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -INCLUDE_DIRECTORIES(${WIX_DIR}/../SDK/inc ${WIX_DIR}/SDK/inc) -LINK_DIRECTORIES(${WIX_DIR}/../SDK/lib ${WIX_DIR}/SDK/lib) - -SET(WIXCA_SOURCES CustomAction.cpp CustomAction.def) - -IF(CMAKE_SIZEOF_VOID_P EQUAL 8) - SET(WIX_ARCH_SUFFIX "_x64") -ELSE() - SET(WIX_ARCH_SUFFIX) -ENDIF() - -IF(MSVC_VERSION EQUAL 1400) - SET(WIX35_MSVC_SUFFIX "_2005") -ELSEIF(MSVC_VERSION EQUAL 1500) - SET(WIX35_MSVC_SUFFIX "_2008") -ELSEIF(MSVC_VERSION EQUAL 1600) - SET(WIX35_MSVC_SUFFIX "_2010") -ELSE() - # When next VS is out, add the correct version here - MESSAGE(FATAL_ERROR "Unknown VS version") -ENDIF() - -MESSAGE(STATUS "Searching for wcautil${WIX_ARCH_SUFFIX} or wcautil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX} in ${WIX_DIR}/../SDK/lib ${WIX_DIR}/SDK/lib") -MESSAGE(STATUS "Searching for dutil${WIX_ARCH_SUFFIX} or dutil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX} in ${WIX_DIR}/../SDK/lib ${WIX_DIR}/SDK/lib") - -FIND_LIBRARY(WIX_WCAUTIL_LIBRARY - NAMES wcautil${WIX_ARCH_SUFFIX} wcautil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX} - HINTS ${WIX_DIR}/../SDK/lib ${WIX_DIR}/SDK/lib) - -FIND_LIBRARY(WIX_DUTIL_LIBRARY - NAMES dutil${WIX_ARCH_SUFFIX} dutil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX} - PATHS ${WIX_DIR}/../SDK/lib ${WIX_DIR}/SDK/lib) - -MESSAGE(STATUS "Found: ${WIX_WCAUTIL_LIBRARY}") -MESSAGE(STATUS "Found: ${WIX_DUTIL_LIBRARY}") - -ADD_VERSION_INFO(wixca SHARED WIXCA_SOURCES) -ADD_LIBRARY(wixca SHARED EXCLUDE_FROM_ALL ${WIXCA_SOURCES}) -TARGET_LINK_LIBRARIES(wixca ${WIX_WCAUTIL_LIBRARY} ${WIX_DUTIL_LIBRARY} - msi version ) diff --git a/packaging/WiX/ca/CustomAction.cpp b/packaging/WiX/ca/CustomAction.cpp deleted file mode 100644 index 444e003c3f2cc..0000000000000 --- a/packaging/WiX/ca/CustomAction.cpp +++ /dev/null @@ -1,188 +0,0 @@ -/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - -#ifndef UNICODE -#define UNICODE -#endif - -#include -#include -#include -#include -#include -#include -#include - -/* - * Search the registry for a service whose ImagePath starts - * with our install directory. Stop and remove it if requested. - */ -static TCHAR last_service_name[128]; -int remove_service(TCHAR *installdir, int check_only) { - HKEY hKey; - int done = 0; - - if(wcslen(installdir) < 3) { - WcaLog(LOGMSG_STANDARD, "INSTALLDIR is suspiciously short, better not do anything."); - return 0; - } - - if(check_only == 0) { - WcaLog(LOGMSG_STANDARD, "Determining number of matching services..."); - int servicecount = remove_service(installdir, 1); - if(servicecount <= 0) { - WcaLog(LOGMSG_STANDARD, "No services found, not removing anything."); - return 0; - } else if(servicecount == 1) { - TCHAR buf[256]; - swprintf_s(buf, sizeof(buf), TEXT("There is a service called '%ls' set up to run from this installation. Do you wish me to stop and remove that service?"), last_service_name); - int rc = MessageBox(NULL, buf, TEXT("Removing MySQL Server"), MB_ICONQUESTION|MB_YESNOCANCEL|MB_SYSTEMMODAL); - if(rc == IDCANCEL) return -1; - if(rc != IDYES) return 0; - } else if(servicecount > 0) { - TCHAR buf[256]; - swprintf_s(buf, sizeof(buf), TEXT("There appear to be %d services set up to run from this installation. Do you wish me to stop and remove those services?"), servicecount); - int rc = MessageBox(NULL, buf, TEXT("Removing MySQL Server"), MB_ICONQUESTION|MB_YESNOCANCEL|MB_SYSTEMMODAL); - if(rc == IDCANCEL) return -1; - if(rc != IDYES) return 0; - } - } - - if(check_only == -1) check_only = 0; - - WcaLog(LOGMSG_STANDARD, "Looking for service..."); - WcaLog(LOGMSG_STANDARD, "INSTALLDIR = %ls", installdir); - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, TEXT("SYSTEM\\CurrentControlSet\\services"), 0, KEY_READ, &hKey)==ERROR_SUCCESS) { - DWORD index = 0; - TCHAR keyname[1024]; - DWORD keylen = sizeof(keyname); - FILETIME t; - /* Go through all services in the registry */ - while(RegEnumKeyExW(hKey, index, keyname, &keylen, NULL, NULL, NULL, &t) == ERROR_SUCCESS) { - HKEY hServiceKey = 0; - TCHAR path[1024]; - DWORD pathlen = sizeof(path)-1; - if (RegOpenKeyExW(hKey, keyname, NULL, KEY_READ, &hServiceKey) == ERROR_SUCCESS) { - /* Look at the ImagePath value of each service */ - if (RegQueryValueExW(hServiceKey, TEXT("ImagePath"), NULL, NULL, (LPBYTE)path, &pathlen) == ERROR_SUCCESS) { - path[pathlen] = 0; - TCHAR *p = path; - if(p[0] == '"') p += 1; - /* See if it is similar to our install directory */ - if(wcsncmp(p, installdir, wcslen(installdir)) == 0) { - WcaLog(LOGMSG_STANDARD, "Found service '%ls' with ImagePath '%ls'.", keyname, path); - swprintf_s(last_service_name, sizeof(last_service_name), TEXT("%ls"), keyname); - /* If we are supposed to stop and remove the service... */ - if(!check_only) { - WcaLog(LOGMSG_STANDARD, "Trying to stop the service."); - SC_HANDLE hSCM = NULL; - hSCM = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); - if(hSCM != NULL) { - SC_HANDLE hService = NULL; - hService = OpenService(hSCM, keyname, SERVICE_STOP|SERVICE_QUERY_STATUS|DELETE); - if(hService != NULL) { - WcaLog(LOGMSG_STANDARD, "Waiting for the service to stop..."); - SERVICE_STATUS status; - /* Attempt to stop the service */ - if(ControlService(hService, SERVICE_CONTROL_STOP, &status)) { - /* Now wait until it's stopped */ - while("it's one big, mean and cruel world out there") { - if(!QueryServiceStatus(hService, &status)) break; - if(status.dwCurrentState == SERVICE_STOPPED) break; - Sleep(1000); - } - WcaLog(LOGMSG_STANDARD, "Stopped the service."); - } - /* Mark the service for deletion */ - DeleteService(hService); - CloseServiceHandle(hService); - } - CloseServiceHandle(hSCM); - } - } - done++; - } - } - RegCloseKey(hServiceKey); - } - index++; - keylen = sizeof(keyname)-1; - } - RegCloseKey(hKey); - } else { - WcaLog(LOGMSG_STANDARD, "Can't seem to go through the list of installed services in the registry."); - } - return done; -} - -UINT wrap(MSIHANDLE hInstall, char *name, int check_only) { - HRESULT hr = S_OK; - UINT er = ERROR_SUCCESS; - - hr = WcaInitialize(hInstall, name); - ExitOnFailure(hr, "Failed to initialize"); - - WcaLog(LOGMSG_STANDARD, "Initialized."); - - TCHAR INSTALLDIR[1024]; - DWORD INSTALLDIR_size = sizeof(INSTALLDIR); - if(MsiGetPropertyW(hInstall, TEXT("CustomActionData"), INSTALLDIR, &INSTALLDIR_size) == ERROR_SUCCESS) { - int rc = remove_service(INSTALLDIR, check_only); - if(rc < 0) { - er = ERROR_CANCELLED; - } - } else { - er = ERROR_CANT_ACCESS_FILE; - } - -LExit: - return WcaFinalize(er); -} - -UINT __stdcall RemoveServiceNoninteractive(MSIHANDLE hInstall) -{ - return wrap(hInstall, "RemoveServiceNoninteractive", -1); -} - -UINT __stdcall RemoveService(MSIHANDLE hInstall) -{ - return wrap(hInstall, "RemoveService", 0); -} - -UINT __stdcall TestService(MSIHANDLE hInstall) -{ - return wrap(hInstall, "TestService", 1); -} - -/* DllMain - Initialize and cleanup WiX custom action utils */ -extern "C" BOOL WINAPI DllMain( - __in HINSTANCE hInst, - __in ULONG ulReason, - __in LPVOID - ) -{ - switch(ulReason) - { - case DLL_PROCESS_ATTACH: - WcaGlobalInitialize(hInst); - break; - - case DLL_PROCESS_DETACH: - WcaGlobalFinalize(); - break; - } - - return TRUE; -} diff --git a/packaging/WiX/ca/CustomAction.def b/packaging/WiX/ca/CustomAction.def deleted file mode 100644 index 5f5e663001350..0000000000000 --- a/packaging/WiX/ca/CustomAction.def +++ /dev/null @@ -1,8 +0,0 @@ -LIBRARY "wixca" -VERSION 1.0 - -EXPORTS - -RemoveService -RemoveServiceNoninteractive -TestService diff --git a/packaging/WiX/create_msi.cmake.in b/packaging/WiX/create_msi.cmake.in deleted file mode 100644 index d0a8f0046cff2..0000000000000 --- a/packaging/WiX/create_msi.cmake.in +++ /dev/null @@ -1,398 +0,0 @@ -# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@") -SET(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@") -SET(CANDLE_EXECUTABLE "@CANDLE_EXECUTABLE@") -SET(LIGHT_EXECUTABLE "@LIGHT_EXECUTABLE@") -SET(CMAKE_COMMAND "@CMAKE_COMMAND@") -SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@") -SET(VERSION "@VERSION@") -SET(MAJOR_VERSION "@MAJOR_VERSION@") -SET(MINOR_VERSION "@MINOR_VERSION@") -SET(PATCH_VERSION "@PATCH_VERSION@") -SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@) -SET(MANUFACTURER "@MANUFACTURER@") -SET(WIXCA_LOCATION "@WIXCA_LOCATION@") -SET(COPYING_RTF "@COPYING_RTF@") -SET(CPACK_WIX_CONFIG "@CPACK_WIX_CONFIG@") -SET(CPACK_WIX_INCLUDE "@CPACK_WIX_INCLUDE@") - -LIST(APPEND EXCLUDE_DIRS - bin/debug - data/test - lib/plugin/debug - mysql-test - scripts - sql-bench -) - -LIST(APPEND EXCLUDE_FILES - bin/echo.exe - bin/mysql_client_test_embedded.exe - bin/mysqld-debug.exe - bin/mysqltest_embedded.exe - bin/replace.exe - lib/debug/mysqlserver.lib - lib/libmysqld.dll - lib/libmysqld.lib - lib/mysqlserver.lib - lib/mysqlservices.lib -) - -IF(CMAKE_SIZEOF_VOID_P EQUAL 8) - SET(Win64 " Win64='yes'") - SET(Platform x64) - SET(PlatformProgramFilesFolder ProgramFiles64Folder) -ELSE() - SET(Platform x86) - SET(PlatformProgramFilesFolder ProgramFilesFolder) - SET(Win64) -ENDIF() - -SET(ENV{VS_UNICODE_OUTPUT}) - -# Switch off the monolithic install -EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=0 ${CMAKE_BINARY_DIR} - OUTPUT_QUIET -) - -INCLUDE(${CMAKE_BINARY_DIR}/CPackConfig.cmake) - -IF(CPACK_WIX_CONFIG) - INCLUDE(${CPACK_WIX_CONFIG}) -ENDIF() - -IF(NOT CPACK_WIX_UI) - SET(CPACK_WIX_UI "WixUI_Mondo_Custom") -ENDIF() - -SET(WIX_FEATURES) -FOREACH(comp ${CPACK_COMPONENTS_ALL}) - STRING(TOUPPER "${comp}" comp_upper) - IF(NOT CPACK_COMPONENT_${comp_upper}_GROUP) - SET(WIX_FEATURE_${comp_upper}_COMPONENTS "${comp}") - SET(CPACK_COMPONENT_${comp_upper}_HIDDEN 1) - SET(CPACK_COMPONENT_GROUP_${comp_upper}_DISPLAY_NAME ${CPACK_COMPONENT_${comp_upper}_DISPLAY_NAME}) - SET(CPACK_COMPONENT_GROUP_${comp_upper}_DESCRIPTION ${CPACK_COMPONENT_${comp_upper}_DESCRIPTION}) - SET(CPACK_COMPONENT_GROUP_${comp_upper}_WIX_LEVEL ${CPACK_COMPONENT_${comp_upper}_WIX_LEVEL}) - SET(WIX_FEATURES ${WIX_FEATURES} WIX_FEATURE_${comp_upper}) - ELSE() - SET(FEATURE_NAME WIX_FEATURE_${CPACK_COMPONENT_${comp_upper}_GROUP}) - SET(WIX_FEATURES ${WIX_FEATURES} ${FEATURE_NAME}) - LIST(APPEND ${FEATURE_NAME}_COMPONENTS ${comp}) - ENDIF() -ENDFOREACH() - -LIST(REMOVE_DUPLICATES WIX_FEATURES) - -SET(CPACK_WIX_FEATURES) - -FOREACH(f ${WIX_FEATURES}) - STRING(TOUPPER "${f}" f_upper) - STRING(REPLACE "WIX_FEATURE_" "" f_upper ${f_upper}) - IF (CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME) - SET(TITLE ${CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME}) - ELSE() - SET(TITLE CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME) - ENDIF() - - IF (CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION) - SET(DESCRIPTION ${CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION}) - ELSE() - SET(DESCRIPTION CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION) - ENDIF() - IF(CPACK_COMPONENT_${f_upper}_WIX_LEVEL) - SET(Level ${CPACK_COMPONENT_${f_upper}_WIX_LEVEL}) - ELSE() - SET(Level 1) - ENDIF() - IF(CPACK_COMPONENT_GROUP_${f_upper}_HIDDEN) - SET(DISPLAY "Display='hidden'") - SET(TITLE ${f_upper}) - SET(DESCRIPTION ${f_upper}) - ELSE() - SET(DISPLAY) - IF(CPACK_COMPONENT_GROUP_${f_upper}_EXPANDED) - SET(DISPLAY "Display='expand'") - ENDIF() - IF (CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME) - SET(TITLE ${CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME}) - ELSE() - SET(TITLE CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME) - ENDIF() - IF (CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION) - SET(DESCRIPTION ${CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION}) - ELSE() - SET(DESCRIPTION CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION) - ENDIF() - ENDIF() - - SET(CPACK_WIX_FEATURES - "${CPACK_WIX_FEATURES} - " - ) - FOREACH(c ${${f}_COMPONENTS}) - STRING(TOUPPER "${c}" c_upper) - IF (CPACK_COMPONENT_${c_upper}_DISPLAY_NAME) - SET(TITLE ${CPACK_COMPONENT_${c_upper}_DISPLAY_NAME}) - ELSE() - SET(TITLE CPACK_COMPONENT_${c_upper}_DISPLAY_NAME) - ENDIF() - - IF (CPACK_COMPONENT_${c_upper}_DESCRIPTION) - SET(DESCRIPTION ${CPACK_COMPONENT_${c_upper}_DESCRIPTION}) - ELSE() - SET(DESCRIPTION CPACK_COMPONENT_${c_upper}_DESCRIPTION) - ENDIF() - IF(CPACK_COMPONENT_${c_upper}_WIX_LEVEL) - SET(Level ${CPACK_COMPONENT_${c_upper}_WIX_LEVEL}) - ELSE() - SET(Level 1) - ENDIF() - IF(CPACK_COMPONENT_${c_upper}_HIDDEN) - SET(CPACK_WIX_FEATURES - "${CPACK_WIX_FEATURES} - ") - ELSE() - SET(CPACK_WIX_FEATURES - "${CPACK_WIX_FEATURES} - - - ") - ENDIF() - - ENDFOREACH() - SET(CPACK_WIX_FEATURES - "${CPACK_WIX_FEATURES} - - ") -ENDFOREACH() - - -IF(CMAKE_INSTALL_CONFIG_NAME) - STRING(REPLACE "${CMAKE_CFG_INTDIR}" "${CMAKE_INSTALL_CONFIG_NAME}" - WIXCA_LOCATION "${WIXCA_LOCATION}") - SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_INSTALL_CONFIG_NAME}") -ENDIF() - -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in - ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs) - - -FOREACH(comp ${CPACK_COMPONENTS_ALL}) - SET(ENV{DESTDIR} testinstall/${comp}) - SET(DIRS ${DIRS} testinstall/${comp}) - EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} ${CONFIG_PARAM} -DCMAKE_INSTALL_COMPONENT=${comp} - -DCMAKE_INSTALL_PREFIX= -P ${CMAKE_BINARY_DIR}/cmake_install.cmake - OUTPUT_QUIET - ) -ENDFOREACH() - -MACRO(GENERATE_GUID VarName) - EXECUTE_PROCESS(COMMAND uuidgen -c - OUTPUT_VARIABLE ${VarName} - OUTPUT_STRIP_TRAILING_WHITESPACE) -ENDMACRO() - -SET(INC_VAR 0) -MACRO(MAKE_WIX_IDENTIFIER str varname) - STRING(REPLACE "/" "." ${varname} "${str}") - STRING(REGEX REPLACE "[^a-zA-Z_0-9.]" "_" ${varname} "${${varname}}") - STRING(LENGTH "${${varname}}" len) - # Identifier should be smaller than 72 character - # We have to cut down the length to 70 chars, since we add 2 char prefix - # pretty often - IF(len GREATER 70) - STRING(SUBSTRING "${${varname}}" 0 67 shortstr) - MATH(EXPR INC_VAR ${INC_VAR}+1) - SET(${varname} "${shortstr}${INC_VAR}") - ENDIF() -ENDMACRO() - - -FUNCTION(TRAVERSE_FILES dir topdir file file_comp dir_root) - FILE(RELATIVE_PATH dir_rel ${topdir} ${dir}) - IF(dir_rel) - LIST(FIND EXCLUDE_DIRS ${dir_rel} TO_EXCLUDE) - IF(NOT TO_EXCLUDE EQUAL -1) - MESSAGE(STATUS "excluding directory: ${dir_rel}") - RETURN() - ENDIF() - ENDIF() - FILE(GLOB all_files ${dir}/*) - IF(NOT all_files) - RETURN() - ENDIF() - IF(dir_rel) - MAKE_DIRECTORY(${dir_root}/${dir_rel}) - MAKE_WIX_IDENTIFIER("${dir_rel}" id) - SET(DirectoryRefId "D.${id}") - ELSE() - SET(DirectoryRefId "INSTALLDIR") - ENDIF() - FILE(APPEND ${file} "\n") - - SET(NONEXEFILES) - FOREACH(f ${all_files}) - IF(NOT IS_DIRECTORY ${f}) - FILE(RELATIVE_PATH rel ${topdir} ${f}) - SET(TO_EXCLUDE) - IF(rel MATCHES "\\.pdb$") - SET(TO_EXCLUDE TRUE) - ELSE() - LIST(FIND EXCLUDE_FILES ${rel} RES) - IF(NOT RES EQUAL -1) - SET(TO_EXCLUDE TRUE) - ENDIF() - ENDIF() - IF(TO_EXCLUDE) - MESSAGE(STATUS "excluding file: ${rel}") - ELSE() - MAKE_WIX_IDENTIFIER("${rel}" id) - FILE(TO_NATIVE_PATH ${f} f_native) - GET_FILENAME_COMPONENT(f_ext "${f}" EXT) - # According to MSDN each DLL or EXE should be in the own component - IF(f_ext MATCHES ".exe" OR f_ext MATCHES ".dll") - - FILE(APPEND ${file} " \n") - FILE(APPEND ${file} " \n") - FILE(APPEND ${file} " \n") - FILE(APPEND ${file_comp} " \n") - ELSE() - SET(NONEXEFILES "${NONEXEFILES}\n" ) - ENDIF() - ENDIF() - ENDIF() - ENDFOREACH() - FILE(APPEND ${file} "\n") - IF(NONEXEFILES) - GENERATE_GUID(guid) - SET(ComponentId "C._files_${COMP_NAME}.${DirectoryRefId}") - FILE(APPEND ${file} - "\n${NONEXEFILES}\n\n") - FILE(APPEND ${file_comp} " \n") - ENDIF() - FOREACH(f ${all_files}) - IF(IS_DIRECTORY ${f}) - TRAVERSE_FILES(${f} ${topdir} ${file} ${file_comp} ${dir_root}) - ENDIF() - ENDFOREACH() -ENDFUNCTION() - -FUNCTION(TRAVERSE_DIRECTORIES dir topdir file prefix) - FILE(RELATIVE_PATH rel ${topdir} ${dir}) - IF(rel) - MAKE_WIX_IDENTIFIER("${rel}" id) - GET_FILENAME_COMPONENT(name ${dir} NAME) - FILE(APPEND ${file} "${prefix}\n") - ENDIF() - FILE(GLOB all_files ${dir}/*) - FOREACH(f ${all_files}) - IF(IS_DIRECTORY ${f}) - TRAVERSE_DIRECTORIES(${f} ${topdir} ${file} "${prefix} ") - ENDIF() - ENDFOREACH() - IF(rel) - FILE(APPEND ${file} "${prefix}\n") - ENDIF() -ENDFUNCTION() - -SET(CPACK_WIX_COMPONENTS) -SET(CPACK_WIX_COMPONENT_GROUPS) -GET_FILENAME_COMPONENT(abs . ABSOLUTE) -FOREACH(d ${DIRS}) - GET_FILENAME_COMPONENT(d ${d} ABSOLUTE) - GET_FILENAME_COMPONENT(d_name ${d} NAME) - FILE(WRITE ${abs}/${d_name}_component_group.wxs "") - SET(COMP_NAME ${d_name}) - TRAVERSE_FILES(${d} ${d} ${abs}/${d_name}.wxs ${abs}/${d_name}_component_group.wxs "${abs}/dirs") - FILE(APPEND ${abs}/${d_name}_component_group.wxs "") - IF(EXISTS ${d_name}.wxs) - FILE(READ ${d_name}.wxs WIX_TMP) - SET(CPACK_WIX_COMPONENTS "${CPACK_WIX_COMPONENTS}\n${WIX_TMP}") - FILE(REMOVE ${d_name}.wxs) - ENDIF() - - FILE(READ ${d_name}_component_group.wxs WIX_TMP) - - SET(CPACK_WIX_COMPONENT_GROUPS "${CPACK_WIX_COMPONENT_GROUPS}\n${WIX_TMP}") - FILE(REMOVE ${d_name}_component_group.wxs) -ENDFOREACH() - -FILE(WRITE directories.wxs "\n") -TRAVERSE_DIRECTORIES(${abs}/dirs ${abs}/dirs directories.wxs "") -FILE(APPEND directories.wxs "\n") - -FILE(READ directories.wxs CPACK_WIX_DIRECTORIES) -FILE(REMOVE directories.wxs) - - -FOREACH(src ${CPACK_WIX_INCLUDE}) -SET(CPACK_WIX_INCLUDES -"${CPACK_WIX_INCLUDES} - " -) -ENDFOREACH() - - -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in - ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs) - -SET(EXTRA_CANDLE_ARGS) -IF("$ENV{EXTRA_CANDLE_ARGS}") - SET(EXTRA_CANDLE_ARGS "$ENV{EXTRA_CANDLE_ARGS}") -ENDIF() - -SET(EXTRA_LIGHT_ARGS) -IF("$ENV{EXTRA_LIGHT_ARGS}") - SET(EXTRA_LIGHT_ARGS "$ENV{EXTRA_LIGHT_ARGS}") -ENDIF() - -FILE(REMOVE mysql_server.wixobj) -EXECUTE_PROCESS( - COMMAND ${CANDLE_EXECUTABLE} -ext WixUtilExtension mysql_server.wxs ${EXTRA_CANDLE_ARGS} - RESULT_VARIABLE CANDLE_RESULT -) - -IF(CANDLE_RESULT) - MESSAGE(FATAL_ERROR "ERROR: can't run candle") -ENDIF() - -EXECUTE_PROCESS( - COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension - mysql_server.wixobj -out ${CPACK_PACKAGE_FILE_NAME}.msi - ${EXTRA_LIGHT_ARGS} - RESULT_VARIABLE LIGHT_RESULT -) - -IF(LIGHT_RESULT) - MESSAGE(FATAL_ERROR "ERROR: can't run light") -ENDIF() - -# Switch monolithic install on again -EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=1 ${CMAKE_BINARY_DIR} -) diff --git a/packaging/WiX/custom_ui.wxs b/packaging/WiX/custom_ui.wxs deleted file mode 100644 index 0ccd30f6754ee..0000000000000 --- a/packaging/WiX/custom_ui.wxs +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - 1 - - - NOT OLDERVERSIONBEINGUPGRADED - OLDERVERSIONBEINGUPGRADED - - - - - - - - - - - - 1]]> - OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST) - OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D" - OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D" - (OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F") - - - 1 - - - WixUI_InstallMode = "Remove" - - - - - - - - - - - - - - - - - - - - - - 1 - - 1 - LicenseAccepted = "1" - - 1 - 1 - 1 - 1 - - WixUI_InstallMode = "Change" - WixUI_InstallMode = "InstallCustom" - 1 - - WixUI_InstallMode = "InstallCustom" - WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete" - WixUI_InstallMode = "Change" - WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove" - - 1 - - 1 - 1 - 1 - 1 - - 1 - - - NOT Installed - - - - - diff --git a/packaging/WiX/extra.wxs.in b/packaging/WiX/extra.wxs.in deleted file mode 100644 index 92a79064d54b8..0000000000000 --- a/packaging/WiX/extra.wxs.in +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - @DATADIR_MYSQL_FILES@ - - - - - - - - @DATADIR_PERFORMANCE_SCHEMA_FILES@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in deleted file mode 100644 index 1e7c20468ef3a..0000000000000 --- a/packaging/WiX/mysql_server.wxs.in +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - NOT NEWERVERSIONDETECTED OR Installed - - - - - - - - - - NOT - Installed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSTALLDIR2 - - - - - - - - - - - - - - - - - - - - - - - Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" - Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" - Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel>4 - Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel<=4 - - - - - - - - - - - - - - @CPACK_WIX_FEATURES@ - - - @CPACK_WIX_DIRECTORIES@ - - - @CPACK_WIX_COMPONENTS@ - - - @CPACK_WIX_COMPONENT_GROUPS@ - - - @CPACK_WIX_INCLUDES@ - - - diff --git a/packaging/rpm-oel/CMakeLists.txt b/packaging/rpm-oel/CMakeLists.txt deleted file mode 100644 index 95249a9404f81..0000000000000 --- a/packaging/rpm-oel/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -IF(UNIX) - SET(prefix ${CMAKE_INSTALL_PREFIX}) - - SET(SPECFILENAME "mysql.spec") - IF("${VERSION}" MATCHES "-ndb-") - STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}") - SET(SPECFILENAME "mysql-cluster-${NDBVERSION}.spec") - ENDIF() - - # Left in current directory, to be taken during build - CONFIGURE_FILE(mysql.spec.in ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY) - - FOREACH(fedfile my.cnf my_config.h mysql_config.sh - mysqld.service mysql-systemd-start mysql.conf - filter-requires.sh filter-provides.sh mysql.init - mysql-5.5-libmysqlclient-symbols.patch) - CONFIGURE_FILE(${fedfile} ${CMAKE_CURRENT_BINARY_DIR}/${fedfile} COPYONLY) - ENDFOREACH() -ENDIF() - diff --git a/packaging/rpm-oel/filter-provides.sh b/packaging/rpm-oel/filter-provides.sh deleted file mode 100755 index bc166bd82d0f6..0000000000000 --- a/packaging/rpm-oel/filter-provides.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash -# - -/usr/lib/rpm/perl.prov $* | -sed -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d' - diff --git a/packaging/rpm-oel/filter-requires.sh b/packaging/rpm-oel/filter-requires.sh deleted file mode 100755 index 3fdf43870fa52..0000000000000 --- a/packaging/rpm-oel/filter-requires.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash -# - -/usr/lib/rpm/perl.req $* | -sed -e '/perl(GD)/d' -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d' - diff --git a/packaging/rpm-oel/my.cnf b/packaging/rpm-oel/my.cnf deleted file mode 100644 index b8ee584d485a7..0000000000000 --- a/packaging/rpm-oel/my.cnf +++ /dev/null @@ -1,31 +0,0 @@ -# For advice on how to change settings please see -# http://dev.mysql.com/doc/refman/5.5/en/server-configuration-defaults.html - -[mysqld] -# -# Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. -# innodb_buffer_pool_size = 128M -# -# Remove leading # to turn on a very important data integrity option: logging -# changes to the binary log between backups. -# log_bin -# -# Remove leading # to set options mainly useful for reporting servers. -# The server defaults are faster for transactions and fast SELECTs. -# Adjust sizes as needed, experiment to find the optimal values. -# join_buffer_size = 128M -# sort_buffer_size = 2M -# read_rnd_buffer_size = 2M -datadir=/var/lib/mysql -socket=/var/lib/mysql/mysql.sock - -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -# Recommended in standard MySQL setup -#sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - -[mysqld_safe] -log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid diff --git a/packaging/rpm-oel/my_config.h b/packaging/rpm-oel/my_config.h deleted file mode 100644 index 75dc5e1d754b9..0000000000000 --- a/packaging/rpm-oel/my_config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Fedora supports multi arch: having 32 and 64 versions of MySQL - * installed at the same time. my_config.h will differ due arch - * dependent defs creating a file conflict. We move arch specific - * headers to arch specific file names and include the correct arch - * specific file by installing this generic file. - * - */ - -#if defined(__i386__) -#include "my_config_i386.h" -#elif defined(__ia64__) -#include "my_config_ia64.h" -#elif defined(__powerpc__) -#include "my_config_ppc.h" -#elif defined(__powerpc64__) -#include "my_config_ppc64.h" -#elif defined(__s390x__) -#include "my_config_s390x.h" -#elif defined(__s390__) -#include "my_config_s390.h" -#elif defined(__sparc__) && defined(__arch64__) -#include "my_config_sparc64.h" -#elif defined(__sparc__) -#include "my_config_sparc.h" -#elif defined(__x86_64__) -#include "my_config_x86_64.h" -#else -#error "This MySQL devel package does not work your architecture?" -#endif diff --git a/packaging/rpm-oel/mysql-5.5-libmysqlclient-symbols.patch b/packaging/rpm-oel/mysql-5.5-libmysqlclient-symbols.patch deleted file mode 100644 index ce5455ee29bf5..0000000000000 --- a/packaging/rpm-oel/mysql-5.5-libmysqlclient-symbols.patch +++ /dev/null @@ -1,982 +0,0 @@ -diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt ---- old/libmysql/CMakeLists.txt 2013-11-05 08:19:26.000000000 +0100 -+++ new/libmysql/CMakeLists.txt 2014-01-10 15:41:30.530068723 +0100 -@@ -205,13 +205,14 @@ IF(NOT DISABLE_SHARED) - OUTPUT_NAME mysqlclient - VERSION "${OS_SHARED_LIB_VERSION}" - SOVERSION "${SHARED_LIB_MAJOR_VERSION}") -+ CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver) - IF(LINK_FLAG_NO_UNDEFINED) - GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS) - IF(NOT libmysql_link_flag) - SET(libmysql_link_flags) - ENDIF() - SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS -- "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}") -+ "${libmysql_link_flags} -Wl,--version-script=libmysql.ver ${LINK_FLAG_NO_UNDEFINED}") - ENDIF() - # clean direct output needs to be set several targets have the same name - #(mysqlclient in this case) -diff -rup old/libmysql/libmysql.c new/libmysql/libmysql.c ---- old/libmysql/libmysql.c 2013-11-05 08:19:26.000000000 +0100 -+++ new/libmysql/libmysql.c 2014-01-10 15:46:35.708928462 +0100 -@@ -4870,3 +4870,612 @@ my_bool STDCALL mysql_read_query_result( - return (*mysql->methods->read_query_result)(mysql); - } - -+#ifndef EMBEDDED_LIBRARY -+ -+// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions -+ -+#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16") -+ -+void STDCALL symver16_myodbc_remove_escape(MYSQL *mysql,char *name) -+{ -+ return myodbc_remove_escape(mysql, name); -+} -+SYM_16(myodbc_remove_escape); -+ -+ -+my_ulonglong STDCALL symver16_mysql_affected_rows(MYSQL *mysql) -+{ -+ return mysql_affected_rows(mysql); -+} -+SYM_16(mysql_affected_rows); -+ -+ -+my_bool STDCALL symver16_mysql_autocommit(MYSQL * mysql, my_bool auto_mode) -+{ -+ return mysql_autocommit(mysql, auto_mode); -+} -+SYM_16(mysql_autocommit); -+ -+ -+my_bool STDCALL symver16_mysql_change_user(MYSQL *mysql, const char *user, const char *passwd, const char *db) -+{ -+ return mysql_change_user(mysql, user, passwd, db); -+} -+SYM_16(mysql_change_user); -+ -+ -+const char * STDCALL symver16_mysql_character_set_name(MYSQL *mysql) -+{ -+ return mysql_character_set_name(mysql); -+} -+SYM_16(mysql_character_set_name); -+ -+ -+my_bool STDCALL symver16_mysql_commit(MYSQL * mysql) -+{ -+ return mysql_commit(mysql); -+} -+SYM_16(mysql_commit); -+ -+ -+void STDCALL symver16_mysql_data_seek(MYSQL_RES *result, my_ulonglong row) -+{ -+ return mysql_data_seek(result, row); -+} -+SYM_16(mysql_data_seek); -+ -+ -+void STDCALL symver16_mysql_debug(const char *debug __attribute__((unused))) -+{ -+ return mysql_debug(debug); -+} -+SYM_16(mysql_debug); -+ -+ -+int STDCALL symver16_mysql_dump_debug_info(MYSQL *mysql) -+{ -+ return mysql_dump_debug_info(mysql); -+} -+SYM_16(mysql_dump_debug_info); -+ -+ -+my_bool STDCALL symver16_mysql_embedded(void) -+{ -+ return mysql_embedded(); -+} -+SYM_16(mysql_embedded); -+ -+ -+my_bool STDCALL symver16_mysql_eof(MYSQL_RES *res) -+{ -+ return mysql_eof(res); -+} -+SYM_16(mysql_eof); -+ -+ -+ulong STDCALL symver16_mysql_escape_string(char *to,const char *from,ulong length) -+{ -+ return mysql_escape_string(to, from, length); -+} -+SYM_16(mysql_escape_string); -+ -+ -+MYSQL_FIELD * STDCALL symver16_mysql_fetch_field(MYSQL_RES *result) -+{ -+ return mysql_fetch_field(result); -+} -+SYM_16(mysql_fetch_field); -+ -+ -+MYSQL_FIELD * STDCALL symver16_mysql_fetch_field_direct(MYSQL_RES *res,uint fieldnr) -+{ -+ return mysql_fetch_field_direct(res, fieldnr); -+} -+SYM_16(mysql_fetch_field_direct); -+ -+ -+MYSQL_FIELD * STDCALL symver16_mysql_fetch_fields(MYSQL_RES *res) -+{ -+ return mysql_fetch_fields(res); -+} -+SYM_16(mysql_fetch_fields); -+ -+ -+unsigned int STDCALL symver16_mysql_field_count(MYSQL *mysql) -+{ -+ return mysql_field_count(mysql); -+} -+SYM_16(mysql_field_count); -+ -+ -+MYSQL_FIELD_OFFSET STDCALL symver16_mysql_field_seek(MYSQL_RES *result, MYSQL_FIELD_OFFSET field_offset) -+{ -+ return mysql_field_seek(result, field_offset); -+} -+SYM_16(mysql_field_seek); -+ -+ -+MYSQL_FIELD_OFFSET STDCALL symver16_mysql_field_tell(MYSQL_RES *res) -+{ -+ return mysql_field_tell(res); -+} -+SYM_16(mysql_field_tell); -+ -+ -+void STDCALL symver16_mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *csinfo) -+{ -+ return mysql_get_character_set_info(mysql, csinfo); -+} -+SYM_16(mysql_get_character_set_info); -+ -+ -+const char * STDCALL symver16_mysql_get_client_info(void) -+{ -+ return mysql_get_client_info(); -+} -+SYM_16(mysql_get_client_info); -+ -+ulong STDCALL symver16_mysql_get_client_version(void) -+{ -+ return mysql_get_client_version(); -+} -+SYM_16(mysql_get_client_version); -+ -+ -+const char * STDCALL symver16_mysql_get_host_info(MYSQL *mysql) -+{ -+ return mysql_get_host_info(mysql); -+} -+SYM_16(mysql_get_host_info); -+ -+ -+MYSQL_PARAMETERS *STDCALL symver16_mysql_get_parameters(void) -+{ -+ return mysql_get_parameters(); -+} -+SYM_16(mysql_get_parameters); -+ -+ -+uint STDCALL symver16_mysql_get_proto_info(MYSQL *mysql) -+{ -+ return mysql_get_proto_info(mysql); -+} -+SYM_16(mysql_get_proto_info); -+ -+ -+const char * STDCALL symver16_mysql_get_server_info(MYSQL *mysql) -+{ -+ return mysql_get_server_info(mysql); -+} -+SYM_16(mysql_get_server_info); -+ -+ -+ulong STDCALL symver16_mysql_hex_string(char *to, const char *from, ulong length) -+{ -+ return mysql_hex_string(to, from, length); -+} -+SYM_16(mysql_hex_string); -+ -+ -+const char *STDCALL symver16_mysql_info(MYSQL *mysql) -+{ -+ return mysql_info(mysql); -+} -+SYM_16(mysql_info); -+ -+ -+my_ulonglong STDCALL symver16_mysql_insert_id(MYSQL *mysql) -+{ -+ return mysql_insert_id(mysql); -+} -+SYM_16(mysql_insert_id); -+ -+ -+int STDCALL symver16_mysql_kill(MYSQL *mysql,ulong pid) -+{ -+ return mysql_kill(mysql, pid); -+} -+SYM_16(mysql_kill); -+ -+ -+MYSQL_RES * STDCALL symver16_mysql_list_dbs(MYSQL *mysql, const char *wild) -+{ -+ return mysql_list_dbs(mysql, wild); -+} -+SYM_16(mysql_list_dbs); -+ -+ -+MYSQL_RES * STDCALL symver16_mysql_list_fields(MYSQL *mysql, const char *table, const char *wild) -+{ -+ return mysql_list_fields(mysql, table, wild); -+} -+SYM_16(mysql_list_fields); -+ -+ -+MYSQL_RES * STDCALL symver16_mysql_list_processes(MYSQL *mysql) -+{ -+ return mysql_list_processes(mysql); -+} -+SYM_16(mysql_list_processes); -+ -+ -+MYSQL_RES * STDCALL symver16_mysql_list_tables(MYSQL *mysql, const char *wild) -+{ -+ return mysql_list_tables(mysql, wild); -+} -+SYM_16(mysql_list_tables); -+ -+ -+my_bool STDCALL symver16_mysql_more_results(MYSQL *mysql) -+{ -+ return mysql_more_results(mysql); -+} -+SYM_16(mysql_more_results); -+ -+ -+int STDCALL symver16_mysql_next_result(MYSQL *mysql) -+{ -+ return mysql_next_result(mysql); -+} -+SYM_16(mysql_next_result); -+ -+ -+int STDCALL symver16_mysql_ping(MYSQL *mysql) -+{ -+ return mysql_ping(mysql); -+} -+SYM_16(mysql_ping); -+ -+ -+int STDCALL symver16_mysql_query(MYSQL *mysql, const char *query) -+{ -+ return mysql_query(mysql, query); -+} -+SYM_16(mysql_query); -+ -+ -+my_bool STDCALL symver16_mysql_read_query_result(MYSQL *mysql) -+{ -+ return mysql_read_query_result(mysql); -+} -+SYM_16(mysql_read_query_result); -+ -+ -+ulong STDCALL symver16_mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, ulong length) -+{ -+ return mysql_real_escape_string(mysql, to, from, length); -+} -+SYM_16(mysql_real_escape_string); -+ -+ -+int STDCALL symver16_mysql_refresh(MYSQL *mysql,uint options) -+{ -+ return mysql_refresh(mysql, options); -+} -+SYM_16(mysql_refresh); -+ -+ -+my_bool STDCALL symver16_mysql_rollback(MYSQL * mysql) -+{ -+ return mysql_rollback(mysql); -+} -+SYM_16(mysql_rollback); -+ -+ -+MYSQL_ROW_OFFSET STDCALL symver16_mysql_row_seek(MYSQL_RES *result, MYSQL_ROW_OFFSET row) -+{ -+ return mysql_row_seek(result, row); -+} -+SYM_16(mysql_row_seek); -+ -+ -+MYSQL_ROW_OFFSET STDCALL symver16_mysql_row_tell(MYSQL_RES *res) -+{ -+ return mysql_row_tell(res); -+} -+SYM_16(mysql_row_tell); -+ -+ -+void STDCALL symver16_mysql_server_end() -+{ -+ return mysql_server_end(); -+} -+SYM_16(mysql_server_end); -+ -+ -+int STDCALL symver16_mysql_server_init(int argc __attribute__((unused)), char **argv __attribute__((unused)), char **groups __attribute__((unused))) -+{ -+ return mysql_server_init(argc, argv, groups); -+} -+SYM_16(mysql_server_init); -+ -+ -+void symver16_mysql_set_local_infile_default(MYSQL *mysql) -+{ -+ return mysql_set_local_infile_default(mysql); -+} -+SYM_16(mysql_set_local_infile_default); -+ -+ -+void symver16_mysql_set_local_infile_handler(MYSQL *mysql, int (*local_infile_init)(void **, const char *, void *), int (*local_infile_read)(void *, char *, uint), void (*local_infile_end)(void *), int (*local_infile_error)(void *, char *, uint), void *userdata) -+{ -+ return mysql_set_local_infile_handler(mysql, local_infile_init, local_infile_read, local_infile_end, local_infile_error, userdata); -+} -+SYM_16(mysql_set_local_infile_handler); -+ -+ -+int STDCALL symver16_mysql_set_server_option(MYSQL *mysql, enum enum_mysql_set_option option) -+{ -+ return mysql_set_server_option(mysql, option); -+} -+SYM_16(mysql_set_server_option); -+ -+ -+int STDCALL symver16_mysql_shutdown(MYSQL *mysql, enum mysql_enum_shutdown_level shutdown_level) -+{ -+ return mysql_shutdown(mysql, shutdown_level); -+} -+SYM_16(mysql_shutdown); -+ -+ -+const char *STDCALL symver16_mysql_sqlstate(MYSQL *mysql) -+{ -+ return mysql_sqlstate(mysql); -+} -+SYM_16(mysql_sqlstate); -+ -+ -+const char * STDCALL symver16_mysql_stat(MYSQL *mysql) -+{ -+ return mysql_stat(mysql); -+} -+SYM_16(mysql_stat); -+ -+ -+my_ulonglong STDCALL symver16_mysql_stmt_affected_rows(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_affected_rows(stmt); -+} -+SYM_16(mysql_stmt_affected_rows); -+ -+ -+my_bool STDCALL symver16_mysql_stmt_attr_get(MYSQL_STMT *stmt, enum enum_stmt_attr_type attr_type, void *value) -+{ -+ return mysql_stmt_attr_get(stmt, attr_type, value); -+} -+SYM_16(mysql_stmt_attr_get); -+ -+ -+my_bool STDCALL symver16_mysql_stmt_attr_set(MYSQL_STMT *stmt, enum enum_stmt_attr_type attr_type, const void *value) -+{ -+ return mysql_stmt_attr_set(stmt, attr_type, value); -+} -+SYM_16(mysql_stmt_attr_set); -+ -+ -+my_bool STDCALL symver16_mysql_stmt_bind_param(MYSQL_STMT *stmt, MYSQL_BIND *my_bind) -+{ -+ return mysql_stmt_bind_param(stmt, my_bind); -+} -+SYM_16(mysql_stmt_bind_param); -+ -+ -+my_bool STDCALL symver16_mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *my_bind) -+{ -+ return mysql_stmt_bind_result(stmt, my_bind); -+} -+SYM_16(mysql_stmt_bind_result); -+ -+ -+my_bool STDCALL symver16_mysql_stmt_close(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_close(stmt); -+} -+SYM_16(mysql_stmt_close); -+ -+ -+void STDCALL symver16_mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong row) -+{ -+ return mysql_stmt_data_seek(stmt, row); -+} -+SYM_16(mysql_stmt_data_seek); -+ -+ -+uint STDCALL symver16_mysql_stmt_errno(MYSQL_STMT * stmt) -+{ -+ return mysql_stmt_errno(stmt); -+} -+SYM_16(mysql_stmt_errno); -+ -+ -+const char *STDCALL symver16_mysql_stmt_error(MYSQL_STMT * stmt) -+{ -+ return mysql_stmt_error(stmt); -+} -+SYM_16(mysql_stmt_error); -+ -+ -+int STDCALL symver16_mysql_stmt_execute(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_execute(stmt); -+} -+SYM_16(mysql_stmt_execute); -+ -+ -+int STDCALL symver16_mysql_stmt_fetch(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_fetch(stmt); -+} -+SYM_16(mysql_stmt_fetch); -+ -+ -+int STDCALL symver16_mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *my_bind, uint column, ulong offset) -+{ -+ return mysql_stmt_fetch_column(stmt, my_bind, column, offset); -+} -+SYM_16(mysql_stmt_fetch_column); -+ -+ -+unsigned int STDCALL symver16_mysql_stmt_field_count(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_field_count(stmt); -+} -+SYM_16(mysql_stmt_field_count); -+ -+ -+my_bool STDCALL symver16_mysql_stmt_free_result(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_free_result(stmt); -+} -+SYM_16(mysql_stmt_free_result); -+ -+ -+MYSQL_STMT * STDCALL symver16_mysql_stmt_init(MYSQL *mysql) -+{ -+ return mysql_stmt_init(mysql); -+} -+SYM_16(mysql_stmt_init); -+ -+ -+my_ulonglong STDCALL symver16_mysql_stmt_insert_id(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_insert_id(stmt); -+} -+SYM_16(mysql_stmt_insert_id); -+ -+ -+my_ulonglong STDCALL symver16_mysql_stmt_num_rows(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_num_rows(stmt); -+} -+SYM_16(mysql_stmt_num_rows); -+ -+ -+ulong STDCALL symver16_mysql_stmt_param_count(MYSQL_STMT * stmt) -+{ -+ return mysql_stmt_param_count(stmt); -+} -+SYM_16(mysql_stmt_param_count); -+ -+ -+MYSQL_RES * STDCALL symver16_mysql_stmt_param_metadata(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_param_metadata(stmt); -+} -+SYM_16(mysql_stmt_param_metadata); -+ -+ -+int STDCALL symver16_mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query, ulong length) -+{ -+ return mysql_stmt_prepare(stmt, query, length); -+} -+SYM_16(mysql_stmt_prepare); -+ -+ -+my_bool STDCALL symver16_mysql_stmt_reset(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_reset(stmt); -+} -+SYM_16(mysql_stmt_reset); -+ -+ -+MYSQL_RES * STDCALL symver16_mysql_stmt_result_metadata(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_result_metadata(stmt); -+} -+SYM_16(mysql_stmt_result_metadata); -+ -+ -+MYSQL_ROW_OFFSET STDCALL symver16_mysql_stmt_row_seek(MYSQL_STMT *stmt, MYSQL_ROW_OFFSET row) -+{ -+ return mysql_stmt_row_seek(stmt, row); -+} -+SYM_16(mysql_stmt_row_seek); -+ -+ -+MYSQL_ROW_OFFSET STDCALL symver16_mysql_stmt_row_tell(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_row_tell(stmt); -+} -+SYM_16(mysql_stmt_row_tell); -+ -+ -+my_bool STDCALL symver16_mysql_stmt_send_long_data(MYSQL_STMT *stmt, uint param_number, const char *data, ulong length) -+{ -+ return mysql_stmt_send_long_data(stmt, param_number, data, length); -+} -+SYM_16(mysql_stmt_send_long_data); -+ -+ -+const char *STDCALL symver16_mysql_stmt_sqlstate(MYSQL_STMT * stmt) -+{ -+ return mysql_stmt_sqlstate(stmt); -+} -+SYM_16(mysql_stmt_sqlstate); -+ -+ -+int STDCALL symver16_mysql_stmt_store_result(MYSQL_STMT *stmt) -+{ -+ return mysql_stmt_store_result(stmt); -+} -+SYM_16(mysql_stmt_store_result); -+ -+ -+void STDCALL symver16_mysql_thread_end() -+{ -+ return mysql_thread_end(); -+} -+SYM_16(mysql_thread_end); -+ -+ -+ulong STDCALL symver16_mysql_thread_id(MYSQL *mysql) -+{ -+ return mysql_thread_id(mysql); -+} -+SYM_16(mysql_thread_id); -+ -+ -+my_bool STDCALL symver16_mysql_thread_init() -+{ -+ return mysql_thread_init(); -+} -+SYM_16(mysql_thread_init); -+ -+ -+uint STDCALL symver16_mysql_thread_safe(void) -+{ -+ return mysql_thread_safe(); -+} -+SYM_16(mysql_thread_safe); -+ -+ -+MYSQL_RES * STDCALL symver16_mysql_use_result(MYSQL *mysql) -+{ -+ return mysql_use_result(mysql); -+} -+SYM_16(mysql_use_result); -+ -+ -+uint STDCALL symver16_mysql_warning_count(MYSQL *mysql) -+{ -+ return mysql_warning_count(mysql); -+} -+SYM_16(mysql_warning_count); -+ -+/*****/ -+ -+MYSQL * STDCALL symver16_mysql_real_connect(MYSQL *mysql,const char *host, const char *user, const char *passwd, const char *db, uint port, const char *unix_socket,ulong client_flag) -+{ -+ return mysql_real_connect(mysql, host, user, passwd, db, port, unix_socket, client_flag); -+} -+SYM_16(mysql_real_connect); -+ -+/*****/ -+ -+my_bool symver16_my_init(void) -+{ -+ return my_init(); -+} -+SYM_16(my_init); -+ -+#endif -diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in ---- old/libmysql/libmysql.ver.in 2013-11-05 08:19:26.000000000 +0100 -+++ new/libmysql/libmysql.ver.in 2014-01-10 15:41:30.545182782 +0100 -@@ -1 +1,136 @@ --libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; }; -+libmysqlclient_16 -+{ -+ local: -+ symver16_*; -+}; -+ -+libmysqlclient_18 -+{ -+ global: -+ my_init; -+ myodbc_remove_escape; -+ mysql_affected_rows; -+ mysql_autocommit; -+ mysql_change_user; -+ mysql_character_set_name; -+ mysql_close; -+ mysql_commit; -+ mysql_data_seek; -+ mysql_debug; -+ mysql_dump_debug_info; -+ mysql_embedded; -+ mysql_eof; -+ mysql_errno; -+ mysql_error; -+ mysql_escape_string; -+ mysql_fetch_field; -+ mysql_fetch_field_direct; -+ mysql_fetch_fields; -+ mysql_fetch_lengths; -+ mysql_fetch_row; -+ mysql_field_count; -+ mysql_field_seek; -+ mysql_field_tell; -+ mysql_free_result; -+ mysql_get_character_set_info; -+ mysql_get_client_info; -+ mysql_get_client_version; -+ mysql_get_host_info; -+ mysql_get_parameters; -+ mysql_get_proto_info; -+ mysql_get_server_info; -+ mysql_get_server_version; -+ mysql_get_ssl_cipher; -+ mysql_hex_string; -+ mysql_info; -+ mysql_init; -+ mysql_insert_id; -+ mysql_kill; -+ mysql_list_dbs; -+ mysql_list_fields; -+ mysql_list_processes; -+ mysql_list_tables; -+ mysql_more_results; -+ mysql_next_result; -+ mysql_num_fields; -+ mysql_num_rows; -+ mysql_options; -+ mysql_ping; -+ mysql_query; -+ mysql_read_query_result; -+ mysql_real_connect; -+ mysql_real_escape_string; -+ mysql_real_query; -+ mysql_refresh; -+ mysql_rollback; -+ mysql_row_seek; -+ mysql_row_tell; -+ mysql_select_db; -+ mysql_send_query; -+ mysql_server_end; -+ mysql_server_init; -+ mysql_set_character_set; -+ mysql_set_local_infile_default; -+ mysql_set_local_infile_handler; -+ mysql_set_server_option; -+ mysql_shutdown; -+ mysql_sqlstate; -+ mysql_ssl_set; -+ mysql_stat; -+ mysql_stmt_affected_rows; -+ mysql_stmt_attr_get; -+ mysql_stmt_attr_set; -+ mysql_stmt_bind_param; -+ mysql_stmt_bind_result; -+ mysql_stmt_close; -+ mysql_stmt_data_seek; -+ mysql_stmt_errno; -+ mysql_stmt_error; -+ mysql_stmt_execute; -+ mysql_stmt_fetch; -+ mysql_stmt_fetch_column; -+ mysql_stmt_field_count; -+ mysql_stmt_free_result; -+ mysql_stmt_init; -+ mysql_stmt_insert_id; -+ mysql_stmt_num_rows; -+ mysql_stmt_param_count; -+ mysql_stmt_param_metadata; -+ mysql_stmt_prepare; -+ mysql_stmt_reset; -+ mysql_stmt_result_metadata; -+ mysql_stmt_row_seek; -+ mysql_stmt_row_tell; -+ mysql_stmt_send_long_data; -+ mysql_stmt_sqlstate; -+ mysql_stmt_store_result; -+ mysql_store_result; -+ mysql_thread_end; -+ mysql_thread_id; -+ mysql_thread_init; -+ mysql_thread_safe; -+ mysql_use_result; -+ mysql_warning_count; -+ -+ free_defaults; -+ handle_options; -+ load_defaults; -+ my_print_help; -+ -+ #my_make_scrambled_password; -+ THR_KEY_mysys; -+ -+ mysql_client_find_plugin; -+ mysql_client_register_plugin; -+ mysql_load_plugin; -+ mysql_load_plugin_v; -+ mysql_plugin_options; -+ mysql_stmt_next_result; -+ -+ #mysql_default_charset_info; -+ mysql_get_charset; -+ mysql_get_charset_by_csname; -+ mysql_net_realloc; -+ #mysql_client_errors; -+ *; -+} libmysqlclient_16; -diff -rup old/mysys/charset.c new/mysys/charset.c ---- old/mysys/charset.c 2013-11-05 08:19:26.000000000 +0100 -+++ new/mysys/charset.c 2014-01-10 15:41:30.552919678 +0100 -@@ -941,3 +941,20 @@ size_t escape_quotes_for_mysql(CHARSET_I - *to= 0; - return overflow ? (ulong)~0 : (ulong) (to - to_start); - } -+ -+#ifndef EMBEDDED_LIBRARY -+ -+// Hack to provide Fedora symbols -+ -+CHARSET_INFO *mysql_get_charset(uint cs_number, myf flags) -+{ -+ return get_charset(cs_number, flags); -+} -+ -+ -+CHARSET_INFO * mysql_get_charset_by_csname(const char *cs_name, uint cs_flags, myf flags) -+{ -+ return get_charset_by_csname(cs_name, cs_flags, flags); -+} -+ -+#endif -diff -rup old/sql/net_serv.cc new/sql/net_serv.cc ---- old/sql/net_serv.cc 2013-11-05 08:19:26.000000000 +0100 -+++ new/sql/net_serv.cc 2014-01-10 15:41:30.563377346 +0100 -@@ -1190,3 +1190,17 @@ void my_net_set_write_timeout(NET *net, - #endif - DBUG_VOID_RETURN; - } -+ -+#ifndef EMBEDDED_LIBRARY -+C_MODE_START -+ -+// Hack to provide Fedora symbols -+ -+my_bool mysql_net_realloc(NET *net, size_t length) -+{ -+ return net_realloc(net, length); -+} -+ -+C_MODE_END -+#endif -+ -diff -rup old/sql/password.c new/sql/password.c ---- old/sql/password.c 2013-11-05 08:19:26.000000000 +0100 -+++ new/sql/password.c 2014-01-10 15:41:30.567134663 +0100 -@@ -563,3 +563,17 @@ void make_password_from_salt(char *to, c - *to++= PVERSION41_CHAR; - octet2hex(to, (const char*) hash_stage2, SHA1_HASH_SIZE); - } -+ -+#ifndef EMBEDDED_LIBRARY -+ -+// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions -+ -+#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16") -+ -+void symver16_my_make_scrambled_password(char *to, const char *password, size_t pass_len) -+{ -+ my_make_scrambled_password(to, password, pass_len); -+} -+SYM_16(my_make_scrambled_password); -+ -+#endif -diff -rup old/sql-common/client.c new/sql-common/client.c ---- old/sql-common/client.c 2013-11-05 08:19:26.000000000 +0100 -+++ new/sql-common/client.c 2014-01-10 15:41:30.574151024 +0100 -@@ -4399,3 +4399,136 @@ static int clear_password_auth_client(MY - - return res ? CR_ERROR : CR_OK; - } -+ -+#ifndef EMBEDDED_LIBRARY -+ -+// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions -+ -+#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16") -+ -+void STDCALL symver16_mysql_close(MYSQL *mysql) -+{ -+ return mysql_close(mysql); -+} -+SYM_16(mysql_close); -+ -+ -+uint STDCALL symver16_mysql_errno(MYSQL *mysql) -+{ -+ return mysql_errno(mysql); -+} -+SYM_16(mysql_errno); -+ -+ -+const char * STDCALL symver16_mysql_error(MYSQL *mysql) -+{ -+ return mysql_error(mysql); -+} -+SYM_16(mysql_error); -+ -+ -+ulong * STDCALL symver16_mysql_fetch_lengths(MYSQL_RES *res) -+{ -+ return mysql_fetch_lengths(res); -+} -+SYM_16(mysql_fetch_lengths); -+ -+ -+MYSQL_ROW STDCALL symver16_mysql_fetch_row(MYSQL_RES *res) -+{ -+ return mysql_fetch_row(res); -+} -+SYM_16(mysql_fetch_row); -+ -+ -+void STDCALL symver16_mysql_free_result(MYSQL_RES *result) -+{ -+ return mysql_free_result(result); -+} -+SYM_16(mysql_free_result); -+ -+ -+ulong STDCALL symver16_mysql_get_server_version(MYSQL *mysql) -+{ -+ return mysql_get_server_version(mysql); -+} -+SYM_16(mysql_get_server_version); -+ -+ -+const char * STDCALL symver16_mysql_get_ssl_cipher(MYSQL *mysql __attribute__((unused))) -+{ -+ return mysql_get_ssl_cipher(mysql); -+} -+SYM_16(mysql_get_ssl_cipher); -+ -+ -+MYSQL * STDCALL symver16_mysql_init(MYSQL *mysql) -+{ -+ return mysql_init(mysql); -+} -+SYM_16(mysql_init); -+ -+ -+unsigned int STDCALL symver16_mysql_num_fields(MYSQL_RES *res) -+{ -+ return mysql_num_fields(res); -+} -+SYM_16(mysql_num_fields); -+ -+ -+my_ulonglong STDCALL symver16_mysql_num_rows(MYSQL_RES *res) -+{ -+ return mysql_num_rows(res); -+} -+SYM_16(mysql_num_rows); -+ -+ -+int STDCALL symver16_mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg) -+{ -+ return mysql_options(mysql, option, arg); -+} -+SYM_16(mysql_options); -+ -+ -+int STDCALL symver16_mysql_real_query(MYSQL *mysql, const char *query, ulong length) -+{ -+ return mysql_real_query(mysql, query, length); -+} -+SYM_16(mysql_real_query); -+ -+ -+int STDCALL symver16_mysql_select_db(MYSQL *mysql, const char *db) -+{ -+ return mysql_select_db(mysql, db); -+} -+SYM_16(mysql_select_db); -+ -+ -+int STDCALL symver16_mysql_send_query(MYSQL* mysql, const char* query, ulong length) -+{ -+ return mysql_send_query(mysql, query, length); -+} -+SYM_16(mysql_send_query); -+ -+ -+int STDCALL symver16_mysql_set_character_set(MYSQL *mysql, const char *cs_name) -+{ -+ return mysql_set_character_set(mysql, cs_name); -+} -+SYM_16(mysql_set_character_set); -+ -+ -+my_bool STDCALL symver16_mysql_ssl_set(MYSQL *mysql __attribute__((unused)), const char *key __attribute__((unused)), const char *cert __attribute__((unused)), const char *ca __attribute__((unused)), const char *capath __attribute__((unused)), const char *cipher __attribute__((unused))) -+{ -+ return mysql_ssl_set(mysql, key, cert, ca, capath, cipher); -+} -+SYM_16(mysql_ssl_set); -+ -+ -+MYSQL_RES * STDCALL symver16_mysql_store_result(MYSQL *mysql) -+{ -+ return mysql_store_result(mysql); -+} -+SYM_16(mysql_store_result); -+ -+#endif diff --git a/packaging/rpm-oel/mysql-systemd-start b/packaging/rpm-oel/mysql-systemd-start deleted file mode 100644 index 8670f889574ef..0000000000000 --- a/packaging/rpm-oel/mysql-systemd-start +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/bash -# -# Scripts to run by MySQL systemd service -# -# Needed argument: pre | post -# -# pre mode : try to run mysql_install_db and fix perms and SELinux contexts -# post mode : ping server until answer is received -# - -get_option () { - local section=$1 - local option=$2 - local default=$3 - ret=$(/usr/bin/my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-) - [ -z $ret ] && ret=$default - echo $ret -} - -install_db () { - # Note: something different than datadir=/var/lib/mysql requires SELinux policy changes (in enforcing mode) - datadir=$(get_option mysqld datadir "/var/lib/mysql") - - # Restore log, dir, perms and SELinux contexts - [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1 - log=/var/log/mysqld.log - [ -e $log ] || touch $log - chmod 0640 $log - chown mysql:mysql $log || exit 1 - if [ -x /usr/sbin/restorecon ]; then - /usr/sbin/restorecon "$datadir" - /usr/sbin/restorecon $log - fi - - # If special mysql dir is in place, skip db install - [ -d "$datadir/mysql" ] && exit 0 - - # Create initial db - /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql - exit 0 -} - -pinger () { - # Wait for ping to answer to signal startup completed, - # might take a while in case of e.g. crash recovery - # MySQL systemd service will timeout script if no answer - datadir=$(get_option mysqld datadir "/var/lib/mysql") - socket=$(get_option mysqld socket "$datadir/mysql.sock") - case $socket in - /*) adminsocket="$socket" ;; - *) adminsocket="$datadir/$socket" ;; - esac - - while /bin/true ; do - sleep 1 - mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break - done - exit 0 -} - -# main -case $1 in - "pre") install_db ;; - "post") pinger ;; -esac - -exit 0 - diff --git a/packaging/rpm-oel/mysql.conf b/packaging/rpm-oel/mysql.conf deleted file mode 100644 index 74cd5f836e76f..0000000000000 --- a/packaging/rpm-oel/mysql.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/mysqld 0755 mysql mysql - diff --git a/packaging/rpm-oel/mysql.init b/packaging/rpm-oel/mysql.init deleted file mode 100644 index 79c8a8daa7d89..0000000000000 --- a/packaging/rpm-oel/mysql.init +++ /dev/null @@ -1,213 +0,0 @@ -#!/bin/sh -# -# mysqld This shell script takes care of starting and stopping -# the MySQL subsystem (mysqld). -# -# chkconfig: - 64 36 -# description: MySQL database server. -# processname: mysqld -# config: /etc/my.cnf -# pidfile: /var/run/mysqld/mysqld.pid - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - - -exec="/usr/bin/mysqld_safe" -prog="mysqld" - -# Set timeouts here so they can be overridden from /etc/sysconfig/mysqld -STARTTIMEOUT=120 -STOPTIMEOUT=60 - -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -lockfile=/var/lock/subsys/$prog - - -# extract value of a MySQL option from config files -# Usage: get_mysql_option SECTION VARNAME DEFAULT -# result is returned in $result -# We use my_print_defaults which prints all options from multiple files, -# with the more specific ones later; hence take the last match. -get_mysql_option(){ - result=`/usr/bin/my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1` - if [ -z "$result" ]; then - # not found, use default - result="$3" - fi -} - -get_mysql_option mysqld datadir "/var/lib/mysql" -datadir="$result" -get_mysql_option mysqld socket "$datadir/mysql.sock" -socketfile="$result" -get_mysql_option mysqld_safe log-error "/var/log/mysqld.log" -errlogfile="$result" -get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid" -mypidfile="$result" - -case $socketfile in - /*) adminsocket="$socketfile" ;; - *) adminsocket="$datadir/$socketfile" ;; -esac - -start(){ - [ -x $exec ] || exit 5 - # check to see if it's already running - RESPONSE=$(/usr/bin/mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping 2>&1) - if [ $? = 0 ]; then - # already running, do nothing - action $"Starting $prog: " /bin/true - ret=0 - elif echo "$RESPONSE" | grep -q "Access denied for user" - then - # already running, do nothing - action $"Starting $prog: " /bin/true - ret=0 - else - # prepare for start - touch "$errlogfile" - chown mysql:mysql "$errlogfile" - chmod 0640 "$errlogfile" - [ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile" - if [ ! -d "$datadir/mysql" ] ; then - # First, make sure $datadir is there with correct permissions - if [ ! -e "$datadir" -a ! -h "$datadir" ] - then - mkdir -p "$datadir" || exit 1 - fi - chown mysql:mysql "$datadir" - chmod 0755 "$datadir" - [ -x /sbin/restorecon ] && /sbin/restorecon "$datadir" - # Now create the database - action $"Initializing MySQL database: " /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql - ret=$? - chown -R mysql:mysql "$datadir" - if [ $ret -ne 0 ] ; then - return $ret - fi - fi - chown mysql:mysql "$datadir" - chmod 0755 "$datadir" - # Pass all the options determined above, to ensure consistent behavior. - # In many cases mysqld_safe would arrive at the same conclusions anyway - # but we need to be sure. (An exception is that we don't force the - # log-error setting, since this script doesn't really depend on that, - # and some users might prefer to configure logging to syslog.) - # Note: set --basedir to prevent probes that might trigger SELinux - # alarms, per bug #547485 - $exec --datadir="$datadir" --socket="$socketfile" \ - --pid-file="$mypidfile" \ - --basedir=/usr --user=mysql >/dev/null 2>&1 & - safe_pid=$! - # Spin for a maximum of N seconds waiting for the server to come up; - # exit the loop immediately if mysqld_safe process disappears. - # Rather than assuming we know a valid username, accept an "access - # denied" response as meaning the server is functioning. - ret=0 - TIMEOUT="$STARTTIMEOUT" - while [ $TIMEOUT -gt 0 ]; do - RESPONSE=$(/usr/bin/mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping 2>&1) && break - echo "$RESPONSE" | grep -q "Access denied for user" && break - if ! /bin/kill -0 $safe_pid 2>/dev/null; then - echo "MySQL Daemon failed to start." - ret=1 - break - fi - sleep 1 - let TIMEOUT=${TIMEOUT}-1 - done - if [ $TIMEOUT -eq 0 ]; then - echo "Timeout error occurred trying to start MySQL Daemon." - ret=1 - fi - if [ $ret -eq 0 ]; then - action $"Starting $prog: " /bin/true - touch $lockfile - else - action $"Starting $prog: " /bin/false - fi - fi - return $ret -} - -stop(){ - if [ ! -f "$mypidfile" ]; then - # not running; per LSB standards this is "ok" - action $"Stopping $prog: " /bin/true - return 0 - fi - MYSQLPID=`cat "$mypidfile"` - if [ -n "$MYSQLPID" ]; then - /bin/kill "$MYSQLPID" >/dev/null 2>&1 - ret=$? - if [ $ret -eq 0 ]; then - TIMEOUT="$STOPTIMEOUT" - while [ $TIMEOUT -gt 0 ]; do - /bin/kill -0 "$MYSQLPID" >/dev/null 2>&1 || break - sleep 1 - let TIMEOUT=${TIMEOUT}-1 - done - if [ $TIMEOUT -eq 0 ]; then - echo "Timeout error occurred trying to stop MySQL Daemon." - ret=1 - action $"Stopping $prog: " /bin/false - else - rm -f $lockfile - rm -f "$socketfile" - action $"Stopping $prog: " /bin/true - fi - else - action $"Stopping $prog: " /bin/false - fi - else - # failed to read pidfile, probably insufficient permissions - action $"Stopping $prog: " /bin/false - ret=4 - fi - return $ret -} - -restart(){ - stop - start -} - -condrestart(){ - [ -e $lockfile ] && restart || : -} - - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p "$mypidfile" $prog - ;; - restart) - restart - ;; - condrestart|try-restart) - condrestart - ;; - reload) - exit 3 - ;; - force-reload) - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac - -exit $? diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in deleted file mode 100644 index bb232fb404d6c..0000000000000 --- a/packaging/rpm-oel/mysql.spec.in +++ /dev/null @@ -1,1714 +0,0 @@ -# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston -# MA 02110-1301 USA. - -# Rebuild on OL5/RHEL5 needs following rpmbuild options: -# rpmbuild --define 'dist .el5' --define 'rhel 5' --define 'el5 1' mysql.spec - -# NOTE: "vendor" is used in upgrade/downgrade check, so you can't -# change these, has to be exactly as is. - -%global mysql_vendor Oracle and/or its affiliates -%global mysqldatadir /var/lib/mysql - -# By default, a build will include the bundeled "yaSSL" library for SSL. -%{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}} - -# Regression tests may take a long time, override the default to skip them -%{!?runselftest:%global runselftest 0} - -%{!?with_systemd: %global systemd 0} -%{?el7: %global systemd 1} -%{!?with_debuginfo: %global nodebuginfo 1} -%{!?product_suffix: %global product_suffix community} -%{!?feature_set: %global feature_set community} -%{!?compilation_comment_release: %global compilation_comment_release MySQL Community Server - (GPL)} -%{!?compilation_comment_debug: %global compilation_comment_debug MySQL Community Server - Debug (GPL)} -%{!?src_base: %global src_base mysql} - -# Version for compat libs -%if 0%{?rhel} == 5 -%global compatver 5.0.96 -%global compatlib 15 -%global compatsrc http://downloads.mysql.com/archives/mysql-5.0/mysql-%{compatver}.tar.gz -%endif - -%if 0%{?rhel} == 6 -%global compatver 5.1.72 -%global compatlib 16 -%global compatsrc https://cdn.mysql.com/Downloads/MySQL-5.1/mysql-%{compatver}.tar.gz -%endif - -# multiarch -%global multiarchs ppc %{power64} %{ix86} x86_64 %{sparc} - -# Hack to support el5 where __isa_bits not defined. Note: supports i386 and x86_64 only, sorry. -%if x%{?__isa_bits} == x -%ifarch %{ix86} -%global __isa_bits 32 -%endif -%ifarch x86_64 -%global __isa_bits 64 -%endif -%endif - -%global src_dir %{src_base}-%{version} - -# No debuginfo for now, ships /usr/sbin/mysqld-debug and libmysqlcliet-debug.a -%if 0%{?nodebuginfo} -%global _enable_debug_package 0 -%global debug_package %{nil} -%global __os_install_post /usr/lib/rpm/brp-compress %{nil} -%endif - -%if 0%{?commercial} -%global license_files_server %{src_dir}/LICENSE.mysql -%global license_type Commercial -%else -%global license_files_server %{src_dir}/COPYING %{src_dir}/README -%global license_type GPLv2 -%endif - -Name: mysql-%{product_suffix} -Summary: A very fast and reliable SQL database server -Group: Applications/Databases -Version: @VERSION@ -Release: 2%{?commercial:.1}%{?dist} -License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field. -Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz -URL: http://www.mysql.com/ -Packager: MySQL Release Engineering -Vendor: %{mysql_vendor} -Source1: mysql-systemd-start -Source2: mysqld.service -Source3: mysql.conf -Source4: my_config.h -Source5: mysql_config.sh -%if 0%{?compatlib} -Source7: %{compatsrc} -%endif -Source90: filter-provides.sh -Source91: filter-requires.sh -Patch0: mysql-5.5-libmysqlclient-symbols.patch -BuildRequires: cmake -BuildRequires: perl -%{?el7:BuildRequires: perl(Time::HiRes)} -%{?el7:BuildRequires: perl(Env)} -BuildRequires: time -BuildRequires: libaio-devel -BuildRequires: ncurses-devel -BuildRequires: openssl-devel -BuildRequires: zlib-devel -%if 0%{?systemd} -BuildRequires: systemd -%endif -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -%if 0%{?rhel} > 6 -# For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering -%global __requires_exclude ^perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::) -%global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$ -%else -# https://fedoraproject.org/wiki/EPEL:Packaging#Generic_Filtering_on_EPEL6 -%global __perl_provides %{SOURCE90} -%global __perl_requires %{SOURCE91} -%endif - -%description -The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, -and robust SQL (Structured Query Language) database server. MySQL Server -is intended for mission-critical, heavy-load production systems as well -as for embedding into mass-deployed software. MySQL is a trademark of -%{mysql_vendor} - -The MySQL software has Dual Licensing, which means you can use the MySQL -software free of charge under the GNU General Public License -(http://www.gnu.org/licenses/). You can also purchase commercial MySQL -licenses from %{mysql_vendor} if you do not wish to be bound by the terms of -the GPL. See the chapter "Licensing and Support" in the manual for -further info. - -The MySQL web site (http://www.mysql.com/) provides the latest -news and information about the MySQL software. Also please see the -documentation and the manual for more information. - -%package server -Summary: A very fast and reliable SQL database server -Group: Applications/Databases -Requires: coreutils -Requires: grep -Requires: procps -Requires: shadow-utils -Requires: net-tools -%if 0%{?commercial} -Provides: MySQL-server-advanced%{?_isa} = %{version}-%{release} -Obsoletes: MySQL-server-advanced < %{version}-%{release} -Obsoletes: mysql-community-server < %{version}-%{release} -Requires: mysql-commercial-client%{?_isa} = %{version}-%{release} -Requires: mysql-commercial-common%{?_isa} = %{version}-%{release} -%else -Provides: MySQL-server%{?_isa} = %{version}-%{release} -Requires: mysql-community-client%{?_isa} = %{version}-%{release} -Requires: mysql-community-common%{?_isa} = %{version}-%{release} -%endif -Obsoletes: MySQL-server < %{version}-%{release} -Obsoletes: mysql-server < %{version}-%{release} -Obsoletes: mariadb-server -Obsoletes: mariadb-galera-server -Provides: mysql-server = %{version}-%{release} -Provides: mysql-server%{?_isa} = %{version}-%{release} -Provides: mysql-compat-server = %{version}-%{release} -Provides: mysql-compat-server%{?_isa} = %{version}-%{release} -%if 0%{?systemd} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%else -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -%endif - -%description server -The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, -and robust SQL (Structured Query Language) database server. MySQL Server -is intended for mission-critical, heavy-load production systems as well -as for embedding into mass-deployed software. MySQL is a trademark of -%{mysql_vendor} - -The MySQL software has Dual Licensing, which means you can use the MySQL -software free of charge under the GNU General Public License -(http://www.gnu.org/licenses/). You can also purchase commercial MySQL -licenses from %{mysql_vendor} if you do not wish to be bound by the terms of -the GPL. See the chapter "Licensing and Support" in the manual for -further info. - -The MySQL web site (http://www.mysql.com/) provides the latest news and -information about the MySQL software. Also please see the documentation -and the manual for more information. - -This package includes the MySQL server binary as well as related utilities -to run and administer a MySQL server. - -%package client -Summary: MySQL database client applications and tools -Group: Applications/Databases -%if 0%{?commercial} -Provides: MySQL-client-advanced%{?_isa} = %{version}-%{release} -Obsoletes: MySQL-client-advanced < %{version}-%{release} -Obsoletes: mysql-community-client < %{version}-%{release} -Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} -%else -Provides: MySQL-client%{?_isa} = %{version}-%{release} -Requires: mysql-community-libs%{?_isa} = %{version}-%{release} -%endif -Obsoletes: MySQL-client < %{version}-%{release} -Obsoletes: mariadb -%if 0%{?rhel} > 5 -Obsoletes: mysql < %{version}-%{release} -Provides: mysql = %{version}-%{release} -Provides: mysql%{?_isa} = %{version}-%{release} -%endif - -%description client -This package contains the standard MySQL clients and administration -tools. - -%package common -Summary: MySQL database common files for server and client libs -Group: Applications/Databases -%if 0%{?commercial} -Obsoletes: mysql-community-common < %{version}-%{release} -%endif -Provides: mysql-common = %{version}-%{release} -Provides: mysql-common%{?_isa} = %{version}-%{release} -%{?el5:Requires: mysql%{?_isa} = %{version}-%{release}} - -%description common -This packages contains common files needed by MySQL client library, -MySQL database server, and MySQL embedded server. - - -%package test -Summary: Test suite for the MySQL database server -Group: Applications/Databases -%if 0%{?commercial} -Provides: MySQL-test-advanced%{?_isa} = %{version}-%{release} -Obsoletes: MySQL-test-advanced < %{version}-%{release} -Obsoletes: mysql-community-test < %{version}-%{release} -Requires: mysql-commercial-server%{?_isa} = %{version}-%{release} -%else -Provides: MySQL-test%{?_isa} = %{version}-%{release} -Requires: mysql-community-server%{?_isa} = %{version}-%{release} -%endif -Obsoletes: MySQL-test < %{version}-%{release} -Obsoletes: mysql-test < %{version}-%{release} -Obsoletes: mariadb-test -Provides: mysql-test = %{version}-%{release} -Provides: mysql-test%{?_isa} = %{version}-%{release} - - -%description test -This package contains the MySQL regression test suite for MySQL -database server. - - -%package bench -Summary: MySQL benchmark suite -Group: Applications/Databases -%if 0%{?commercial} -Obsoletes: mysql-community-bench < %{version}-%{release} -Requires: mysql-commercial-server%{?_isa} = %{version}-%{release} -%else -Requires: mysql-community-server%{?_isa} = %{version}-%{release} -%endif -Obsoletes: mariadb-bench -Obsoletes: community-mysql-bench < %{version}-%{release} -Obsoletes: mysql-bench < %{version}-%{release} -Provides: mysql-bench = %{version}-%{release} -Provides: mysql-bench%{?_isa} = %{version}-%{release} - -%description bench -This package contains the MySQL Benchmark Suite for MySQL database -server. - -%package devel -Summary: Development header files and libraries for MySQL database client applications -Group: Applications/Databases -%if 0%{?commercial} -Provides: MySQL-devel-advanced%{?_isa} = %{version}-%{release} -Obsoletes: MySQL-devel-advanced < %{version}-%{release} -Obsoletes: mysql-community-devel < %{version}-%{release} -Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} -%else -Provides: MySQL-devel%{?_isa} = %{version}-%{release} -Requires: mysql-community-libs%{?_isa} = %{version}-%{release} -%endif -Obsoletes: MySQL-devel < %{version}-%{release} -Obsoletes: mysql-devel < %{version}-%{release} -Obsoletes: mariadb-devel -Provides: mysql-devel = %{version}-%{release} -Provides: mysql-devel%{?_isa} = %{version}-%{release} - -%description devel -This package contains the development header files and libraries necessary -to develop MySQL client applications. - -%package libs -Summary: Shared libraries for MySQL database client applications -Group: Applications/Databases -%if 0%{?commercial} -Provides: MySQL-shared-advanced%{?_isa} = %{version}-%{release} -Obsoletes: MySQL-shared-advanced < %{version}-%{release} -Obsoletes: mysql-community-libs < %{version}-%{release} -Requires: mysql-commercial-common%{?_isa} = %{version}-%{release} -%else -Provides: MySQL-shared%{?_isa} = %{version}-%{release} -Requires: mysql-community-common%{?_isa} = %{version}-%{release} -%endif -Obsoletes: MySQL-shared < %{version}-%{release} -Obsoletes: mysql-libs < %{version}-%{release} -Obsoletes: mariadb-libs -Provides: mysql-libs = %{version}-%{release} -Provides: mysql-libs%{?_isa} = %{version}-%{release} - -%description libs -This package contains the shared libraries for MySQL client -applications. - -%if 0%{?compatlib} -%package libs-compat -Summary: Shared compat libraries for MySQL %{compatver} database client applications -Group: Applications/Databases -Obsoletes: mysql-libs-compat < %{version}-%{release} -Provides: mysql-libs-compat = %{version}-%{release} -Provides: mysql-libs-compat%{?_isa} = %{version}-%{release} -%if 0%{?commercial} -Provides: MySQL-shared-compat-advanced%{?_isa} = %{version}-%{release} -Obsoletes: MySQL-shared-compat-advanced < %{version}-%{release} -Obsoletes: mysql-community-libs-compat < %{version}-%{release} -Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} -%else -Provides: MySQL-shared-compat%{?_isa} = %{version}-%{release} -Requires: mysql-community-libs%{?_isa} = %{version}-%{release} -%endif -Obsoletes: MySQL-shared-compat < %{version}-%{release} -%if 0%{?rhel} > 5 -Obsoletes: mysql-libs < %{version}-%{release} -%endif - -%description libs-compat -This package contains the shared compat libraries for MySQL %{compatver} client -applications. -%endif - -%package embedded -Summary: MySQL embedded library -Group: Applications/Databases -%if 0%{?commercial} -Provides: MySQL-embedded-advanced%{?_isa} = %{version}-%{release} -Obsoletes: MySQL-embedded-advanced < %{version}-%{release} -Obsoletes: mysql-community-embedded < %{version}-%{release} -Requires: mysql-commercial-common%{?_isa} = %{version}-%{release} -%else -Provides: MySQL-embedded%{?_isa} = %{version}-%{release} -Requires: mysql-community-common%{?_isa} = %{version}-%{release} -%endif -Obsoletes: mariadb-embedded -Obsoletes: MySQL-embedded < %{version}-%{release} -Obsoletes: mysql-embedded < %{version}-%{release} -Provides: mysql-embedded = %{version}-%{release} -Provides: mysql-embedded%{?_isa} = %{version}-%{release} - -%description embedded -This package contains the MySQL server as an embedded library. - -The embedded MySQL server library makes it possible to run a full-featured -MySQL server inside the client application. The main benefits are increased -speed and more simple management for embedded applications. - -The API is identical for the embedded MySQL version and the -client/server version. - -For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ - -%package embedded-devel -Summary: Development header files and libraries for MySQL as an embeddable library -Group: Applications/Databases -%if 0%{?commercial} -Obsoletes: mysql-community-embedded-devel < %{version}-%{release} -Requires: mysql-commercial-devel%{?_isa} = %{version}-%{release} -Requires: mysql-commercial-embedded%{?_isa} = %{version}-%{release} -%else -Requires: mysql-community-devel%{?_isa} = %{version}-%{release} -Requires: mysql-community-embedded%{?_isa} = %{version}-%{release} -%endif -Obsoletes: mariadb-embedded-devel -Obsoletes: mysql-embedded-devel < %{version}-%{release} -Provides: mysql-embedded-devel = %{version}-%{release} -Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release} - -%description embedded-devel -This package contains files needed for developing applications using -the embedded version of the MySQL server. - -%if 0%{?rhel} == 5 -%package -n mysql -Summary: Convenience package for easy upgrades of MySQL package set -Group: Applications/Databases -%if 0%{?commercial} -Requires: mysql-commercial-client%{?_isa} = %{version}-%{release} -Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} -Requires: mysql-commercial-libs-compat%{?_isa} = %{version}-%{release} -%else -Requires: mysql-community-client%{?_isa} = %{version}-%{release} -Requires: mysql-community-libs%{?_isa} = %{version}-%{release} -Requires: mysql-community-libs-compat%{?_isa} = %{version}-%{release} -%endif - -%description -n mysql -This package has as sole purpose to require other MySQL packages such -that upgrades will be more convenient. - -Technical background: this is done to reflect the fact that mysql -package has been split into several subpackages. -%endif - -%prep -%if 0%{?compatlib} -%setup -q -T -a 0 -a 7 -c -n %{src_dir} -%else -%setup -q -T -a 0 -c -n %{src_dir} -%endif # 0%{?compatlib} -pushd %{src_dir} -%{?el7:%patch0 -p1} - -%build -# Fail quickly and obviously if user tries to build as root -%if 0%{?runselftest} -if [ "x$(id -u)" = "x0" ] ; then - echo "The MySQL regression tests may fail if run as root." - echo "If you really need to build the RPM as root, use" - echo "--define='runselftest 0' to skip the regression tests." - exit 1 -fi -%endif - -%if 0%{?compatlib} -# Build compat libs -( -export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-strict-aliasing -fwrapv" -export CXXFLAGS="$CFLAGS %{?el6:-felide-constructors} -fno-rtti -fno-exceptions" -pushd mysql-%{compatver} -%configure \ - --with-readline \ - --without-debug \ - --enable-shared \ - --localstatedir=/var/lib/mysql \ - --with-unix-socket-path=/var/lib/mysql/mysql.sock \ - --with-mysqld-user="mysql" \ - --with-extra-charsets=all \ - --enable-local-infile \ - --enable-largefile \ - --enable-thread-safe-client \ -%if 0%{?rhel} == 6 - --with-ssl=%{_prefix} \ - --with-embedded-server \ - --with-big-tables \ - --with-pic \ - --with-plugin-innobase \ - --with-plugin-innodb_plugin \ - --with-plugin-partition \ -%endif -%if 0%{?rhel} == 5 - --with-openssl \ - --with-bench \ - -with-innodb \ - --with-berkeley-db \ - --enable-community-features \ - --enable-profiling \ - --with-named-thread-libs="-lpthread" \ -%endif - --disable-dependency-tracking -make %{?_smp_mflags} -popd -) -%endif # 0%{?compatlib} - -# Build debug versions of mysqld and libmysqld.a -mkdir debug -( - cd debug - # Attempt to remove any optimisation flags from the debug build - optflags=$(echo "%{optflags}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /') - cmake ../%{src_dir} \ - -DBUILD_CONFIG=mysql_release \ - -DINSTALL_LAYOUT=RPM \ - -DCMAKE_BUILD_TYPE=Debug \ - -DENABLE_DTRACE=OFF \ - -DCMAKE_C_FLAGS="$optflags" \ - -DCMAKE_CXX_FLAGS="$optflags" \ - -DINSTALL_LIBDIR="%{_lib}/mysql" \ - -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \ - -DINSTALL_SQLBENCHDIR=share \ - -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ - -DFEATURE_SET="%{feature_set}" \ - -DWITH_EMBEDDED_SERVER=1 \ - -DWITH_EMBEDDED_SHARED_LIBRARY=1 \ - %{?ssl_option} \ - -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \ - -DMYSQL_SERVER_SUFFIX="%{?server_suffix}" - echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG - make %{?_smp_mflags} VERBOSE=1 -) - -# Build full release -mkdir release -( - cd release - cmake ../%{src_dir} \ - -DBUILD_CONFIG=mysql_release \ - -DINSTALL_LAYOUT=RPM \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DENABLE_DTRACE=OFF \ - -DCMAKE_C_FLAGS="%{optflags}" \ - -DCMAKE_CXX_FLAGS="%{optflags}" \ - -DINSTALL_LIBDIR="%{_lib}/mysql" \ - -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \ - -DINSTALL_SQLBENCHDIR=share \ - -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \ - -DFEATURE_SET="%{feature_set}" \ - -DWITH_EMBEDDED_SERVER=1 \ - -DWITH_EMBEDDED_SHARED_LIBRARY=1 \ - %{?ssl_option} \ - -DCOMPILATION_COMMENT="%{compilation_comment_release}" \ - -DMYSQL_SERVER_SUFFIX="%{?server_suffix}" - echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG - make %{?_smp_mflags} VERBOSE=1 -) - -%install -%if 0%{?compatlib} -# Install compat libs -for dir in libmysql libmysql_r ; do - pushd mysql-%{compatver}/$dir - make DESTDIR=%{buildroot} install - popd -done -rm -f %{buildroot}%{_libdir}/mysql/libmysqlclient{,_r}.{a,la,so} -%endif # 0%{?compatlib} - -MBD=$RPM_BUILD_DIR/%{src_dir} - -# Ensure that needed directories exists -install -d -m 0755 %{buildroot}%{_datadir}/mysql/SELinux/RHEL4 -install -d -m 0755 %{buildroot}/var/lib/mysql -install -d -m 0755 %{buildroot}/var/run/mysqld - -# Install all binaries -cd $MBD/release -make DESTDIR=%{buildroot} install - -# Install logrotate and autostart -install -D -m 0644 $MBD/release/support-files/mysql-log-rotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql -install -D -m 0644 $MBD/release/packaging/rpm-oel/my.cnf %{buildroot}%{_sysconfdir}/my.cnf -%if 0%{?systemd} -install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/mysql-systemd-start -install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/mysqld.service -%else -install -D -m 0755 $MBD/release/packaging/rpm-oel/mysql.init %{buildroot}%{_sysconfdir}/init.d/mysqld -%endif -install -D -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/tmpfiles.d/mysql.conf - -# Make library links -install -d -m 0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf - -# multiarch support -%ifarch %{multiarchs} -mv %{buildroot}/%{_includedir}/mysql/my_config.h \ - %{buildroot}/%{_includedir}/mysql/my_config_%{_arch}.h -install -p -m 0644 %{SOURCE4} %{buildroot}/%{_includedir}/mysql/my_config.h -mv %{buildroot}/%{_bindir}/mysql_config %{buildroot}/%{_bindir}/mysql_config-%{__isa_bits} -install -p -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/mysql_config -%endif - -# Install SELinux files in datadir -install -m 0644 $MBD/%{src_dir}/support-files/RHEL4-SElinux/mysql.{fc,te} \ - %{buildroot}%{_datadir}/mysql/SELinux/RHEL4 - -# Remove files pages we explicitly do not want to package -rm -rf %{buildroot}%{_datadir}/mysql/solaris -rm -rf %{buildroot}%{_infodir}/mysql.info* -rm -rf %{buildroot}%{_datadir}/mysql/binary-configure -rm -rf %{buildroot}%{_datadir}/mysql/mysql.server -rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server -rm -f %{buildroot}%{_datadir}/mysql/{ndb-config-2-node,config*}.ini -rm -f %{buildroot}%{_datadir}/mysql/my-*.cnf -%if 0%{?systemd} -rm -rf %{buildroot}%{_sysconfdir}/init.d/mysqld -%endif -rm -rf %{buildroot}%{_bindir}/mysql_embedded -rm -rf %{buildroot}%{_bindir}/mysql_setpermission -rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1* - -%check -%if 0%{?runselftest} -pushd release -make test VERBOSE=1 -export MTR_BUILD_THREAD=auto -pushd mysql-test -./mtr \ - --mem --parallel=auto --force --retry=0 \ - --mysqld=--binlog-format=mixed \ - --suite-timeout=720 --testcase-timeout=30 \ - --clean-vardir -rm -r $(readlink var) var -%endif - -%pre server -/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || : -/usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /bin/bash \ - -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || : - -%post server -datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p') -/bin/chmod 0755 "$datadir" -/bin/touch /var/log/mysqld.log -%if 0%{?systemd} -%systemd_post mysqld.service -/sbin/service mysqld enable >/dev/null 2>&1 || : -%else -/sbin/chkconfig --add mysqld -%endif - -%preun server -%if 0%{?systemd} -%systemd_preun mysqld.service -%else -if [ "$1" = 0 ]; then - /sbin/service mysqld stop >/dev/null 2>&1 || : - /sbin/chkconfig --del mysqld -fi -%endif - -%postun server -%if 0%{?systemd} -%systemd_postun_with_restart mysqld.service -%else -if [ $1 -ge 1 ]; then - /sbin/service mysqld condrestart >/dev/null 2>&1 || : -fi -%endif - -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig - -%if 0%{?compatlib} -%post libs-compat -p /sbin/ldconfig - -%postun libs-compat -p /sbin/ldconfig -%endif - -%post embedded -p /sbin/ldconfig - -%postun embedded -p /sbin/ldconfig - -%files server -%defattr(-, root, root, -) -%doc %{?license_files_server} %{src_dir}/Docs/ChangeLog -%doc %{src_dir}/Docs/INFO_SRC* -%doc release/Docs/INFO_BIN* -%attr(644, root, root) %{_mandir}/man1/innochecksum.1* -%attr(644, root, root) %{_mandir}/man1/my_print_defaults.1* -%attr(644, root, root) %{_mandir}/man1/myisam_ftdump.1* -%attr(644, root, root) %{_mandir}/man1/myisamchk.1* -%attr(644, root, root) %{_mandir}/man1/myisamlog.1* -%attr(644, root, root) %{_mandir}/man1/myisampack.1* -%attr(644, root, root) %{_mandir}/man1/mysql_convert_table_format.1* -%attr(644, root, root) %{_mandir}/man1/mysql_fix_extensions.1* -%attr(644, root, root) %{_mandir}/man8/mysqld.8* -%attr(644, root, root) %{_mandir}/man1/mysqld_multi.1* -%attr(644, root, root) %{_mandir}/man1/mysqld_safe.1* -%attr(644, root, root) %{_mandir}/man1/mysqldumpslow.1* -%attr(644, root, root) %{_mandir}/man1/mysql_install_db.1* -%attr(644, root, root) %{_mandir}/man1/mysql_plugin.1* -%attr(644, root, root) %{_mandir}/man1/mysql_secure_installation.1* -%attr(644, root, root) %{_mandir}/man1/mysql_upgrade.1* -%attr(644, root, root) %{_mandir}/man1/mysqlhotcopy.1* -%attr(644, root, root) %{_mandir}/man1/mysqlman.1* -%attr(644, root, root) %{_mandir}/man1/mysql.server.1* -%attr(644, root, root) %{_mandir}/man1/mysqltest.1* -%attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1* -%attr(644, root, root) %{_mandir}/man1/mysql_zap.1* -%attr(644, root, root) %{_mandir}/man1/mysqlbug.1* -%attr(644, root, root) %{_mandir}/man1/perror.1* -%attr(644, root, root) %{_mandir}/man1/replace.1* -%attr(644, root, root) %{_mandir}/man1/resolve_stack_dump.1* -%attr(644, root, root) %{_mandir}/man1/resolveip.1* - -%config(noreplace) %{_sysconfdir}/my.cnf - -%attr(755, root, root) %{_bindir}/innochecksum -%attr(755, root, root) %{_bindir}/my_print_defaults -%attr(755, root, root) %{_bindir}/myisam_ftdump -%attr(755, root, root) %{_bindir}/myisamchk -%attr(755, root, root) %{_bindir}/myisamlog -%attr(755, root, root) %{_bindir}/myisampack -%attr(755, root, root) %{_bindir}/mysql_convert_table_format -%attr(755, root, root) %{_bindir}/mysql_fix_extensions -%attr(755, root, root) %{_bindir}/mysql_install_db -%attr(755, root, root) %{_bindir}/mysql_plugin -%attr(755, root, root) %{_bindir}/mysql_secure_installation -%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql -%attr(755, root, root) %{_bindir}/mysql_upgrade -%attr(755, root, root) %{_bindir}/mysql_zap -%attr(755, root, root) %{_bindir}/mysqlbug -%attr(755, root, root) %{_bindir}/mysqld_multi -%attr(755, root, root) %{_bindir}/mysqld_safe -%attr(755, root, root) %{_bindir}/mysqldumpslow -%attr(755, root, root) %{_bindir}/mysqlhotcopy -%attr(755, root, root) %{_bindir}/mysqltest -%attr(755, root, root) %{_bindir}/perror -%attr(755, root, root) %{_bindir}/replace -%attr(755, root, root) %{_bindir}/resolve_stack_dump -%attr(755, root, root) %{_bindir}/resolveip -%if 0%{?systemd} -%attr(755, root, root) %{_bindir}/mysql-systemd-start -%endif -%attr(755, root, root) %{_sbindir}/mysqld -%attr(755, root, root) %{_sbindir}/mysqld-debug - -%dir %{_libdir}/mysql/plugin -%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so -%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so -%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so -%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so -%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so -%dir %{_libdir}/mysql/plugin/debug -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so - -%attr(755, root, root) %{_libdir}/mysql/plugin/auth.so -%attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so -%attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini -%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so -%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so -%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so -%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so - -%if 0%{?commercial} -%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so -%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_pam.so -%attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_pam.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/thread_pool.so -%endif - -%attr(644, root, root) %{_datadir}/mysql/fill_help_tables.sql -%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables.sql -%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables_data.sql -%attr(644, root, root) %{_datadir}/mysql/mysql_test_data_timezone.sql -%attr(644, root, root) %{_datadir}/mysql/mysql-log-rotate -%attr(644, root, root) %{_datadir}/mysql/SELinux/RHEL4/mysql.fc -%attr(644, root, root) %{_datadir}/mysql/SELinux/RHEL4/mysql.te -%attr(644, root, root) %{_datadir}/mysql/magic -%attr(644, root, root) %{_prefix}/lib/tmpfiles.d/mysql.conf -%if 0%{?systemd} -%attr(644, root, root) %{_unitdir}/mysqld.service -%else -%attr(755, root, root) %{_sysconfdir}/init.d/mysqld -%endif -%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql -%dir %attr(755, mysql, mysql) /var/lib/mysql -%dir %attr(755, mysql, mysql) /var/run/mysqld - -%files common -%defattr(-, root, root, -) -%{_datadir}/mysql/charsets/ -%{_datadir}/mysql/errmsg-utf8.txt -%{_datadir}/mysql/czech/ -%{_datadir}/mysql/danish/ -%{_datadir}/mysql/dutch/ -%{_datadir}/mysql/english/ -%{_datadir}/mysql/estonian/ -%{_datadir}/mysql/french/ -%{_datadir}/mysql/german/ -%{_datadir}/mysql/greek/ -%{_datadir}/mysql/hungarian/ -%{_datadir}/mysql/italian/ -%{_datadir}/mysql/japanese/ -%{_datadir}/mysql/korean/ -%{_datadir}/mysql/norwegian-ny/ -%{_datadir}/mysql/norwegian/ -%{_datadir}/mysql/polish/ -%{_datadir}/mysql/portuguese/ -%{_datadir}/mysql/romanian/ -%{_datadir}/mysql/russian/ -%{_datadir}/mysql/serbian/ -%{_datadir}/mysql/slovak/ -%{_datadir}/mysql/spanish/ -%{_datadir}/mysql/swedish/ -%{_datadir}/mysql/ukrainian/ - -%files client -%defattr(-, root, root, -) -%attr(755, root, root) %{_bindir}/msql2mysql -%attr(755, root, root) %{_bindir}/mysql -%attr(755, root, root) %{_bindir}/mysql_find_rows -%attr(755, root, root) %{_bindir}/mysql_waitpid -%attr(755, root, root) %{_bindir}/mysqlaccess -# XXX: This should be moved to %{_sysconfdir} -%attr(644, root, root) %{_bindir}/mysqlaccess.conf -%attr(755, root, root) %{_bindir}/mysqladmin -%attr(755, root, root) %{_bindir}/mysqlbinlog -%attr(755, root, root) %{_bindir}/mysqlcheck -%attr(755, root, root) %{_bindir}/mysqldump -%attr(755, root, root) %{_bindir}/mysqlimport -%attr(755, root, root) %{_bindir}/mysqlshow -%attr(755, root, root) %{_bindir}/mysqlslap -%attr(755, root, root) %{_bindir}/mysql_config -%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits} - -%attr(644, root, root) %{_mandir}/man1/msql2mysql.1* -%attr(644, root, root) %{_mandir}/man1/mysql.1* -%attr(644, root, root) %{_mandir}/man1/mysql_find_rows.1* -%attr(644, root, root) %{_mandir}/man1/mysql_waitpid.1* -%attr(644, root, root) %{_mandir}/man1/mysqlaccess.1* -%attr(644, root, root) %{_mandir}/man1/mysqladmin.1* -%attr(644, root, root) %{_mandir}/man1/mysqlbinlog.1* -%attr(644, root, root) %{_mandir}/man1/mysqlcheck.1* -%attr(644, root, root) %{_mandir}/man1/mysqldump.1* -%attr(644, root, root) %{_mandir}/man1/mysqlimport.1* -%attr(644, root, root) %{_mandir}/man1/mysqlshow.1* -%attr(644, root, root) %{_mandir}/man1/mysqlslap.1* - -%files devel -%defattr(-, root, root, -) -%attr(644, root, root) %{_mandir}/man1/comp_err.1* -%attr(644, root, root) %{_mandir}/man1/mysql_config.1* -%attr(755, root, root) %{_bindir}/mysql_config -%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits} -%{_includedir}/mysql -%{_datadir}/aclocal/mysql.m4 -%{_libdir}/mysql/libmysqlclient.a -%{_libdir}/mysql/libmysqlclient_r.a -%{_libdir}/mysql/libmysqlservices.a -%{_libdir}/mysql/libmysqlclient_r.so -%{_libdir}/mysql/libmysqlclient.so - -%files libs -%defattr(-, root, root, -) -%dir %attr(755, root, root) %{_libdir}/mysql -%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf -%{_libdir}/mysql/libmysqlclient.so.18* -%{_libdir}/mysql/libmysqlclient_r.so.18* - -%if 0%{?compatlib} -%files libs-compat -%defattr(-, root, root, -) -%dir %attr(755, root, root) %{_libdir}/mysql -%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf -%{_libdir}/mysql/libmysqlclient.so.%{compatlib} -%{_libdir}/mysql/libmysqlclient.so.%{compatlib}.0.0 -%{_libdir}/mysql/libmysqlclient_r.so.%{compatlib} -%{_libdir}/mysql/libmysqlclient_r.so.%{compatlib}.0.0 -%endif - -%files test -%defattr(-, root, root, -) -%attr(-, root, root) %{_datadir}/mysql-test -%attr(755, root, root) %{_bindir}/mysql_client_test -%attr(755, root, root) %{_bindir}/mysql_client_test_embedded -%attr(755, root, root) %{_bindir}/mysqltest_embedded -%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1* -%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1* -%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1* -%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1* -%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1* - -%files bench -%defattr(-, root, root, -) -%{_datadir}/sql-bench - -%files embedded -%defattr(-, root, root, -) -%dir %attr(755, root, root) %{_libdir}/mysql -%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf -%attr(755, root, root) %{_libdir}/mysql/libmysqld.so.* - -%files embedded-devel -%defattr(-, root, root, -) -%attr(644, root, root) %{_libdir}/mysql/libmysqld.a -%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a -%attr(755, root, root) %{_libdir}/mysql/libmysqld.so - -%if 0%{?rhel} == 5 -%files -n mysql -%defattr(-, root, root, -) -%doc %{?license_files_server} -%endif - -%changelog -* Tue Jul 22 2014 Balasubramanian Kandasamy - 5.5.39-5 -- Provide mysql-compat-server dependencies - -* Tue Jul 08 2014 Balasubramanian Kandasamy - 5.5.39-4 -- Remove perl(GD) and dtrace dependencies - -* Tue Jul 01 2014 Bjorn Munch - 5.5.39-3 -- Disable dtrace, as it fails on OEL6 boxes with Oracle dtrace installed - -* Thu Jun 26 2014 Balasubramanian Kandasamy - 5.5.39-2 -- Resolve embedded-devel conflict issue - -* Wed Jun 25 2014 Balasubramanian Kandasamy - 5.5.39-1 -- Add bench package -- Enable dtrace - -* Sun May 11 2014 Balasubramanian Kandasamy - 5.5.38-2 -- Increment release version to resolve upgrade conflict issue - -* Thu Apr 24 2014 Balasubramanian Kandasamy - 5.5.38-1 -- Updated for 5.5.38 - -* Mon Apr 07 2014 Balasubramanian Kandasamy - 5.5.37-6 -- Fix Cflags for el7 - -* Mon Mar 31 2014 Balasubramanian Kandasamy - 5.5.37-5 -- Support for enterprise packages -- Upgrade from MySQL-* packages - -* Fri Mar 14 2014 Balasubramanian Kandasamy - 5.5.37-4 -- Resolve mysql conflict with mysql-community-client - -* Wed Mar 12 2014 Balasubramanian Kandasamy - 5.5.37-3 -- Resolve conflict with mysql-libs-compat - -* Thu Mar 06 2014 Balasubramanian Kandasamy - 5.5.37-2 -- Resolve conflict issues during upgrade - -* Mon Feb 10 2014 Balasubramanian Kandasamy - 5.5.37-1 -- Add support for el7 (with systemd enabled) -- Enable shared libmysqld by cmake option - -* Fri Oct 25 2013 Balasubramanian Kandasamy - 5.5.35-1 -- Backport changes from 5.6 - -* Mon Nov 05 2012 Joerg Bruehe - -- Allow to override the default to use the bundled yaSSL by an option like - --define="with_ssl /path/to/ssl" - -* Wed Oct 10 2012 Bjorn Munch - -- Replace old my-*.cnf config file examples with template my-default.cnf - -* Fri Oct 05 2012 Joerg Bruehe - -- Let the installation use the new option "--random-passwords" of "mysql_install_db". - (Bug# 12794345 Ensure root password) -- Fix an inconsistency: "new install" vs "upgrade" are told from the (non)existence - of "$mysql_datadir/mysql" (holding table "mysql.user" and other system stuff). - -* Tue Jul 24 2012 Joerg Bruehe - -- Add a macro "runselftest": - if set to 1 (default), the test suite will be run during the RPM build; - this can be oveeridden via the command line by adding - --define "runselftest 0" - Failures of the test suite will NOT make the RPM build fail! - -* Mon Jul 16 2012 Joerg Bruehe - -- Add the man page for the "mysql_config_editor". - -* Mon Jun 11 2012 Joerg Bruehe - -- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging. - -* Wed Feb 29 2012 Brajmohan Saxena - -- Removal all traces of the readline library from mysql (BUG 13738013) - -* Wed Sep 28 2011 Joerg Bruehe - -- Fix duplicate mentioning of "mysql_plugin" and its manual page, - it is better to keep alphabetic order in the files list (merging!). - -* Wed Sep 14 2011 Joerg Bruehe - -- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace - the RPMs of any configuration (of the current or the preceding release series) - by the new ones. This is done by not using the implicitly generated capabilities - (which include the configuration name) and relying on more generic ones which - just list the function ("server", "client", ...). - The implicit generation cannot be prevented, so all these capabilities must be - explicitly listed in "Obsoletes:" - -* Tue Sep 13 2011 Jonathan Perkin - -- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6. Due to - changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to install) - this necessitated a move of the libmygcc.a installation to the install - phase, which is probably where it belonged in the first place. - -* Tue Sep 13 2011 Joerg Bruehe - -- "make_win_bin_dist" and its manual are dropped, cmake does it different. - -* Thu Sep 08 2011 Daniel Fischer - -- Add mysql_plugin man page. - -* Tue Aug 30 2011 Tor Didriksen - -- Set CXX=g++ by default to add a dependency on libgcc/libstdc++. - Also, remove the use of the -fno-exceptions and -fno-rtti flags. - TODO: update distro_buildreq/distro_requires - -* Tue Aug 30 2011 Joerg Bruehe - -- Add the manual page for "mysql_plugin" to the server package. - -* Fri Aug 19 2011 Joerg Bruehe - -- Null-upmerge the fix of bug#37165: This spec file is not affected. -- Replace "/var/lib/mysql" by the spec file variable "%%{mysqldatadir}". - -* Fri Aug 12 2011 Daniel Fischer - -- Source plugin library files list from cmake-generated file. - -* Mon Jul 25 2011 Chuck Bell - -- Added the mysql_plugin client - enables or disables plugins. - -* Thu Jul 21 2011 Sunanda Menon - -- Fix bug#12561297: Added the MySQL embedded binary - -* Thu Jul 07 2011 Joerg Bruehe - -- Fix bug#45415: "rpm upgrade recreates test database" - Let the creation of the "test" database happen only during a new installation, - not in an RPM upgrade. - This affects both the "mkdir" and the call of "mysql_install_db". - -* Wed Feb 09 2011 Joerg Bruehe - -- Fix bug#56581: If an installation deviates from the default file locations - ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade) - should still work, and use these locations. - The problem was that the fix for bug#27072 did not check for local settings. - -* Mon Jan 31 2011 Joerg Bruehe - -- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN". - -* Tue Nov 23 2010 Jonathan Perkin - -- EXCEPTIONS-CLIENT has been deleted, remove it from here too -- Support MYSQL_BUILD_MAKE_JFLAG environment variable for passing - a '-j' argument to make. - -* Mon Nov 1 2010 Georgi Kodinov - -- Added test authentication (WL#1054) plugin binaries - -* Wed Oct 6 2010 Georgi Kodinov - -- Added example external authentication (WL#1054) plugin binaries - -* Wed Aug 11 2010 Joerg Bruehe - -- With a recent spec file cleanup, names have changed: A "-community" part was dropped. - Reflect that in the "Obsoletes" specifications. -- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM. -- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade". - -* Tue Jun 15 2010 Joerg Bruehe - -- Change the behaviour on installation and upgrade: - On installation, do not autostart the server. - *Iff* the server was stopped before the upgrade is started, this is taken as a - sign the administrator is handling that manually, and so the new server will - not be started automatically at the end of the upgrade. - The start/stop scripts will still be installed, so the server will be started - on the next machine boot. - This is the 5.5 version of fixing bug#27072 (RPM autostarting the server). - -* Tue Jun 1 2010 Jonathan Perkin - -- Implement SELinux checks from distribution-specific spec file. - -* Wed May 12 2010 Jonathan Perkin - -- Large number of changes to build using CMake -- Introduce distribution-specific RPMs -- Drop debuginfo, build all binaries with debug/symbols -- Remove __os_install_post, use native macro -- Remove _unpackaged_files_terminate_build, make it an error to have - unpackaged files -- Remove cluster RPMs - -* Wed Mar 24 2010 Joerg Bruehe - -- Add "--with-perfschema" to the configure options. - -* Mon Mar 22 2010 Joerg Bruehe - -- User "usr/lib*" to allow for both "usr/lib" and "usr/lib64", - mask "rmdir" return code 1. -- Remove "ha_example.*" files from the list, they aren't built. - -* Wed Mar 17 2010 Joerg Bruehe - -- Fix a wrong path name in handling the debug plugins. - -* Wed Mar 10 2010 Joerg Bruehe - -- Take the result of the debug plugin build and put it into the optimized tree, - so that it becomes part of the final installation; - include the files in the packlist. Part of the fixes for bug#49022. - -* Mon Mar 01 2010 Joerg Bruehe - -- Set "Oracle and/or its affiliates" as the vendor and copyright owner, - accept upgrading from packages showing MySQL or Sun as vendor. - -* Fri Feb 12 2010 Joerg Bruehe - -- Formatting changes: - Have a consistent structure of separator lines and of indentation - (8 leading blanks => tab). -- Introduce the variable "src_dir". -- Give the environment variables "MYSQL_BUILD_CC(CXX)" precedence - over "CC" ("CXX"). -- Drop the old "with_static" argument analysis, this is not supported - in 5.1 since ages. -- Introduce variables to control the handlers individually, as well - as other options. -- Use the new "--with-plugin" notation for the table handlers. -- Drop handling "/etc/rc.d/init.d/mysql", the switch to "/etc/init.d/mysql" - was done back in 2002 already. -- Make "--with-zlib-dir=bundled" the default, add an option to disable it. -- Add missing manual pages to the file list. -- Improve the runtime check for "libgcc.a", protect it against being tried - with the Intel compiler "icc". - -* Mon Jan 11 2010 Joerg Bruehe - -- Change RPM file naming: - - Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc". - - Release counts from 1, not 0. - -* Wed Dec 23 2009 Joerg Bruehe - -- The "semisync" plugin file name has lost its introductory "lib", - adapt the file lists for the subpackages. - This is a part missing from the fix for bug#48351. -- Remove the "fix_privilege_tables" manual, it does not exist in 5.5 - (and likely, the whole script will go, too). - -* Mon Nov 16 2009 Joerg Bruehe - -- Fix some problems with the directives around "tcmalloc" (experimental), - remove erroneous traces of the InnoDB plugin (that is 5.1 only). - -* Tue Oct 06 2009 Magnus Blaudd - -- Removed mysql_fix_privilege_tables - -* Fri Oct 02 2009 Alexander Nozdrin - -- "mysqlmanager" got removed from version 5.4, all references deleted. - -* Fri Aug 28 2009 Joerg Bruehe - -- Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin. - -* Thu Aug 27 2009 Joerg Bruehe - -- This version does not contain the "Instance manager", "mysqlmanager": - Remove it from the spec file so that packaging succeeds. - -* Mon Aug 24 2009 Jonathan Perkin - -- Add conditionals for bundled zlib and innodb plugin - -* Fri Aug 21 2009 Jonathan Perkin - -- Install plugin libraries in appropriate packages. -- Disable libdaemon_example and ftexample plugins. - -* Thu Aug 20 2009 Jonathan Perkin - -- Update variable used for mysql-test suite location to match source. - -* Fri Nov 07 2008 Joerg Bruehe - -- Correct yesterday's fix, so that it also works for the last flag, - and fix a wrong quoting: un-quoted quote marks must not be escaped. - -* Thu Nov 06 2008 Kent Boortz - -- Removed "mysql_upgrade_shell" -- Removed some copy/paste between debug and normal build - -* Thu Nov 06 2008 Joerg Bruehe - -- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized. - This should cover both gcc and icc flags. Fixes bug#40546. - -* Fri Aug 29 2008 Kent Boortz - -- Removed the "Federated" storage engine option, and enabled in all - -* Tue Aug 26 2008 Joerg Bruehe - -- Get rid of the "warning: Installed (but unpackaged) file(s) found:" - Some generated files aren't needed in RPMs: - - the "sql-bench/" subdirectory - Some files were missing: - - /usr/share/aclocal/mysql.m4 ("devel" subpackage) - - Manual "mysqlbug" ("server" subpackage) - - Program "innochecksum" and its manual ("server" subpackage) - - Manual "mysql_find_rows" ("client" subpackage) - - Script "mysql_upgrade_shell" ("client" subpackage) - - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage) - - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage) - -* Mon Mar 31 2008 Kent Boortz - -- Made the "Federated" storage engine an option -- Made the "Cluster" storage engine and sub packages an option - -* Wed Mar 19 2008 Joerg Bruehe - -- Add the man pages for "ndbd" and "ndb_mgmd". - -* Mon Feb 18 2008 Timothy Smith - -- Require a manual upgrade if the alread-installed mysql-server is - from another vendor, or is of a different major version. - -* Wed May 02 2007 Joerg Bruehe - -- "ndb_size.tmpl" is not needed any more, - "man1/mysql_install_db.1" lacked the trailing '*'. - -* Sat Apr 07 2007 Kent Boortz - -- Removed man page for "mysql_create_system_tables" - -* Wed Mar 21 2007 Daniel Fischer - -- Add debug server. - -* Mon Mar 19 2007 Daniel Fischer - -- Remove Max RPMs; the server RPMs contain a mysqld compiled with all - features that previously only were built into Max. - -* Fri Mar 02 2007 Joerg Bruehe - -- Add several man pages for NDB which are now created. - -* Fri Jan 05 2007 Kent Boortz - -- Put back "libmygcc.a", found no real reason it was removed. - -- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the - correct "libgcc.a" path is returned for the 32/64 bit architecture. - -* Mon Dec 18 2006 Joerg Bruehe - -- Fix the move of "mysqlmanager" to section 8: Directory name was wrong. - -* Thu Dec 14 2006 Joerg Bruehe - -- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql" - in the server RPM. -- The "mysqlmanager" man page got moved from section 1 to 8. - -* Thu Nov 30 2006 Joerg Bruehe - -- Call "make install" using "benchdir_root=%%{_datadir}", - because that is affecting the regression test suite as well. - -* Thu Nov 16 2006 Joerg Bruehe - -- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) - replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading - (bug#22081). - -* Mon Nov 13 2006 Joerg Bruehe - -- Add "--with-partition" t 2006 Joerg Bruehe - -- Use the Perl script to run the tests, because it will automatically check - whether the server is configured with SSL. - -* Tue Jun 27 2006 Joerg Bruehe - -- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216) - -- Revert all previous attempts to call "mysql_upgrade" during RPM upgrade, - there are some more aspects which need to be solved before this is possible. - For now, just ensure the binary "mysql_upgrade" is delivered and installysql.com> - -- To run "mysql_upgrade", we need a running server; - start it in isolation and skip password checks. - -* Sat May 20 2006 Kent Boortz - -- Always compile for PIC, position independent code. - -* Wed May 10 2006 Kent Boortz - -- Use character set "all" when compiling with Cluster, to make Cluster - nodes independent on the character set directory, and the problem - that two RPM sub packages both wants to install this directory. - -* Mon May 01 2006 Kent Boortz - -- Use "./libtool --mode=execute" instead of searching for the - executable in current directory and ".libs". - -* Fri Apr 28 2006 Kent Boortz - -- Install and run "mysql_upgrade" - -* Wed Apr 12 2006 Jim Winstead - -- Remove sql-bench, and MySQL-bench RPM (will be built as an independent - project from the mysql-bench repository) - -* Tue Apr 11 2006 Jim Winstead - -- Remove old mysqltestmanager and related programs -* Sat Apr 01 2006 Kent Boortz - -- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS - -* Tue Mar 07 2006 Kent Boortz - -- Changed product name from "Community Edition" to "Community Server" - -* Mon Mar 06 2006 Kent Boortz - -- Fast mutexes is now disabled by default, but should be - used in Linux builds. - -* Mon Feb 20 2006 Kent Boortz - -- Reintroduced a max build -- Limited testing of 'debug' and 'max' servers -- Berkeley DB only in 'max' - -* Mon Feb 13 2006 Joerg Bruehe - -- Use "-i" on "make test-force"; - this is essential for later evaluation of this log file. - -* Thu Feb 09 2006 Kent Boortz - -- Pass '-static' to libtool, link static with our own libraries, dynamic - with system libraries. Link with the bundled zlib. - -* Wed Feb 08 2006 Kristian Nielsen - -- Modified RPM spec to match new 5.1 debug+max combined community packaging. - -* Sun Dec 18 2005 Kent Boortz - -- Added "client/mysqlslap" - -* Mon Dec 12 2005 Rodrigo Novo - -- Added zlib to the list of (static) libraries installed -- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld) -- Compile MySQL with bundled zlib -- Fixed %%packager name to "MySQL Production Engineering Team" - -* Mon Dec 05 2005 Joerg Bruehe - -- Avoid using the "bundled" zlib on "shared" builds: - As it is not installed (on the build system), this gives dependency - problems with "libtool" causing the build to fail. - (Change was done on Nov 11, but left uncommented.) - -* Tue Nov 22 2005 Joerg Bruehe - -- Extend the file existence check for "init.d/mysql" on un-install - to also guard the call to "insserv"/"chkconfig". - -* Thu Oct 27 2005 Lenz Grimmer - -- added more man pages - -* Wed Oct 19 2005 Kent Boortz - -- Made yaSSL support an option (off by default) - -* Wed Oct 19 2005 Kent Boortz - -- Enabled yaSSL support - -* Sat Oct 15 2005 Kent Boortz - -- Give mode arguments the same way in all places -lenz@mysql.com> - -- fixed the removing of the RPM_BUILD_ROOT in the %%clean section (the - $RBR variable did not get expanded, thus leaving old build roots behind) - -* Thu Aug 04 2005 Lenz Grimmer - -- Fixed the creation of the mysql user group account in the postinstall - section (BUG 12348) -- Fixed enabling the Archive storage engine in the Max binary - -* Tue Aug 02 2005 Lenz Grimmer - -- Fixed the Requires: tag for the server RPM (BUG 12233) - -* Fri Jul 15 2005 Lenz Grimmer - -- create a "mysql" user group and assign the mysql user account to that group - in the server postinstall section. (BUG 10984) - -* Tue Jun 14 2005 Lenz Grimmer - -- Do not build statically on i386 by default, only when adding either "--with - static" or "--define '_with_static 1'" to the RPM build options. Static - linking really only makes sense when linking against the specially patched - glibc 2.2.5. - -* Mon Jun 06 2005 Lenz Grimmer - -- added mysql_client_test to the "bench" subpackage (BUG 10676) -- added the libndbclient static and shared libraries (BUG 10676) - -* Wed Jun 01 2005 Lenz Grimmer - -- use "mysqldatadir" variable instead of hard-coding the path multiple times -- use the "mysqld_user" variable on all occasions a user name is referenced -- removed (incomplete) Brazilian translations -- removed redundant release tags from the subpackage descriptions - -* Wed May 25 2005 Joerg Bruehe - -- Added a "make clean" between separate calls to "BuildMySQL". - -* Thu May 12 2005 Guilhem Bichot - -- Removed the mysql_tableinfo script made obsolete by the information schema - -* Wed Apr 20 2005 Lenz Grimmer - -- Enabled the "blackhole" storage engine for the Max RPM - -* Wed Apr 13 2005 Lenz Grimmer - -- removed the MySQL manual files (html/ps/texi) - they have been removed - from the MySQL sources and are now available seperately. - -* Mon Apr 4 2005 Petr Chardin - -- old mysqlmanager, mysq* Mon Feb 7 2005 Tomas Ulin - -- enabled the "Ndbcluster" storage engine for the max binary -- added extra make install in ndb subdir after Max build to get ndb binaries -- added packages for ndbcluster storage engine - -* Fri Jan 14 2005 Lenz Grimmer - -- replaced obsoleted "BuildPrereq" with "BuildRequires" instead - -* Thu Jan 13 2005 Lenz Grimmer - -- enabled the "Federated" storage engine for the max binary - -* Tue Jan 04 2005 Petr Chardin - -- ISAM and merge storage engines were purged. As well as appropriate - tools and manpages (isamchk and isamlog) - -* Fri Dec 31 2004 Lenz Grimmer - -- enabled the "Archive" storage engine for the max binary -- enabled the "CSV" storage engine for the max binary -- enabled the "Example" storage engine for the max binary - -* Thu Aug 26 2004 Lenz Grimmer - -- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860) - -* Fri Aug 20 2004 Lenz Grimmer - -- do not link statically on IA64/AMD64 as these systems do not have - a patched glibc installed - -* Tue Aug 10 2004 Lenz Grimmer - -- Added libmygcc.a to the devel subpackage (required to link applications - against the the embedded server libmysqld.a) (BUG 4921) - -* Mon Aug 09 2004 Lenz Grimmer - -- Added EXCEPTIONS-CLIENT to the "devel" package - -* Thu Jul 29 2004 Lenz Grimmer - -- disabled OpenSSL in the Max binaries again (the RPM packages were the - only exception to this anyway) (BUG 1043) - -* Wed Jun 30 2004 Lenz Grimmer - -- fixed server postinstall (mysql_install_db was called with the wrong - parameter) - -* Thu Jun 24 2004 Lenz Grimmer - -- added mysql_tzinfo_to_sql to the server subpackage -- run "make clean" instead of "make distclean" - -* Mon Apr 05 2004 Lenz Grimmer - -- added ncurses-devel to the build prerequisites (BUG 3377) - -* Thu Feb 12 2004 Lenz Grimmer - -- when using gcc, _always_ use CXX=gcc -- replaced Copyright with License field (Copyright is obsolete) - -* Tue Feb 03 2004 Lenz Grimmer - -- added myisam_ftdump to the Server package - -* Tue Jan 13 2004 Lenz Grimmer - -- link the mysql client against libreadline instead of libedit (BUG 2289) - -* Mon Dec 22 2003 Lenz Grimmer - -- marked /etc/logrotate.d/mysql as a config file (BUG 2156) - -* Sat Dec 13 2003 Lenz Grimmer - -- fixed file permissions (BUG 1672) - -* Thu Dec 11 2003 Lenz Grimmer - -- made testing for gcc3 a bit more robust - -* Fri Dec 05 2003 Lenz Grimmer - -- added missing file mysql_create_system_tables to the server subpackage - -* Fri Nov 21 2003 Lenz Grimmer - -- removed dependency on MySQL-client from the MySQL-devel subpackage - as it is not really required. (BUG 1610) - -* Fri Aug 29 2003 Lenz Grimmer - -- Fixed BUG 1162 (removed macro names from the changelog) -- Really fixed BUG 998 (disable the checking for installed but - unpackaged files) - -* Tue Aug 05 2003 Lenz Grimmer - -- Fixed BUG 959 (libmysqld not being compiled properly) -- Fixed BUG 998 (RPM build errors): added missing files to the - distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow, - mysql_fix_privilege_tables.1), removed "-n" from install section. - -* Wed Jul 09 2003 Lenz Grimmer - -- removed the GIF Icon (file was not included in the sources anyway) -- removed unused variable shared_lib_version -- do not run automake before building the standard binary - (should not be necessary) -- add server suffix '-standard' to standard binary (to be in line - with the binary tarball distributions) -- Use more RPM macros (_exec_prefix, _sbindir, _libdir, _sysconfdir, - _datadir, _includedir) throughout the spec file. -- allow overriding CC and CXX (required when building with other compilers) - -* Fri May 16 2003 Lenz Grimmer - -- re-enabled RAID again - -* Wed Apr 30 2003 Lenz Grimmer - -- disabled MyISAM RAID (--with-raid)- it throws an assertion which - needs to be investigated first. - -* Mon Mar 10 2003 Lenz Grimmer - -- added missing file mysql_secure_installation to server subpackage - (BUG 141) - -* Tue Feb 11 2003 Lenz Grimmer - -- re-added missing pre- and post(un)install scripts to server subpackage -- added config file /etc/my.cnf to the file list (just for completeness) -- make sure to create the datadir with 755 permissions - -* Mon Jan 27 2003 Lenz Grimmer - -- removed unusedql.com> - -- Reworked the build steps a little bit: the Max binary is supposed - to include OpenSSL, which cannot be linked statically, thus trying - to statically link against a special glibc is futile anyway -- because of this, it is not required to make yet another build run - just to compile the shared libs (saves a lot of time) -- updated package description of the Max subpackage -- clean up the BuildRoot directory afterwards - -* Mon Jul 15 2002 Lenz Grimmer - -- Updated Packager information -- Fixed the build options: the regular package is supposed to - include InnoDB and linked statically, while the Max package - should include BDB and SSL support - -* Fri May 03 2002 Lenz Grimmer - -- Use more RPM macros (e.g. infodir, mandir) to make the spec - file more portable -- reorganized the installation of documentation files: let RPM - take care of this -- reorganized the file list: actually install man pages along - with the binaries of the respective subpackage -- do not include libmysqld.a in the devel subpackage as well, if we - have a special "embedded" subpackage -- reworked the package descriptions - -* Mon Oct 8 2001 Monty - -- Added embedded server as a separate RPM - -* Fri Apr 13 2001 Monty - -- Added mysqld-max to the distribution - -* Tue Jan 2 2001 Monty - -- Added mysql-test to the bench package - -* Fri Aug 18 2000 Tim Smith - -- Added separate libmysql_r directory; now both a threaded - and non-threaded library is shipped. - -* Tue Sep 28 1999 David Axmark - -- Added the support-files/my-example.cnf to the docs directory. - -- Removed devel dependency on base since it is about client - development. - -* Wed Sep 8 1999 David Axmark - -- Cleaned up some for 3.23. - -* Thu Jul 1 1999 David Axmark - -- Added support for shared libraries in a separate sub - package. Original fix by David Fox (dsfox@cogsci.ucsd.edu) - -- The --enable-assembler switch is now automatically disables on - platforms there assembler code is unavailable. This should allow - building this RPM on non i386 systems. - -* Mon Feb 22 1999 David Axmark - -- Removed unportable cc switches from the spec file. The defaults can - now be overridden with environment variables. This feature is used - to compile the official RPM with optimal (but compiler version - specific) switches. - -- Removed the repetitive description parts for the sub rpms. Maybe add - again if RPM gets a multiline macro capability. - -- Added support for a pt_BR translation. Translation contributed by - Jorge Godoy . - -* Wed Nov 4 1998 David Axmark - -- A lot of changes in all the rpm and install scripts. This may even - be a working RPM :-) - -* Sun Aug 16 1998 David Axmark - -- A developers changelog for MySQL is available in the source RPM. And - there is a history of major user visible changed in the Reference - Manual. Only RPM specific changes will be documented here. diff --git a/packaging/rpm-oel/mysql_config.sh b/packaging/rpm-oel/mysql_config.sh deleted file mode 100644 index abe46e0ed74de..0000000000000 --- a/packaging/rpm-oel/mysql_config.sh +++ /dev/null @@ -1,28 +0,0 @@ -#! /bin/bash -# -# Wrapper script for mysql_config to support multilib -# -# Only works on OEL6/RHEL6 and similar -# -# This command respects setarch - -bits=$(rpm --eval %__isa_bits) - -case $bits in - 32|64) status=known ;; - *) status=unknown ;; -esac - -if [ "$status" = "unknown" ] ; then - echo "$0: error: command 'rpm --eval %__isa_bits' returned unknown value: $bits" - exit 1 -fi - - -if [ -x /usr/bin/mysql_config-$bits ] ; then - /usr/bin/mysql_config-$bits "$@" -else - echo "$0: error: needed binary: /usr/bin/mysql_config-$bits is missing. Please check your MySQL installation." - exit 1 -fi - diff --git a/packaging/rpm-oel/mysqld.service b/packaging/rpm-oel/mysqld.service deleted file mode 100644 index 78ef3bffe601c..0000000000000 --- a/packaging/rpm-oel/mysqld.service +++ /dev/null @@ -1,48 +0,0 @@ -# -# Simple MySQL systemd service file -# -# systemd supports lots of fancy features, look here (and linked docs) for a full list: -# http://www.freedesktop.org/software/systemd/man/systemd.exec.html -# -# Note: this file ( /usr/lib/systemd/system/mysql.service ) -# will be overwritten on package upgrade, please copy the file to -# -# /etc/systemd/system/mysql.service -# -# to make needed changes. -# -# systemd-delta can be used to check differences between the two mysql.service files. -# - -[Unit] -Description=MySQL Community Server -After=network.target -After=syslog.target - -[Install] -WantedBy=multi-user.target -Alias=mysql.service - -[Service] -User=mysql -Group=mysql - -# Execute pre and post scripts as root -PermissionsStartOnly=true - -# Needed to create system tables etc. -ExecStartPre=/usr/bin/mysql-systemd-start pre - -# Start main service -ExecStart=/usr/bin/mysqld_safe - -# Don't signal startup success before a ping works -ExecStartPost=/usr/bin/mysql-systemd-start post - -# Give up if ping don't get an answer -TimeoutSec=600 - -Restart=always -PrivateTmp=false - - diff --git a/packaging/solaris/CMakeLists.txt b/packaging/solaris/CMakeLists.txt deleted file mode 100644 index 899847d0f38ac..0000000000000 --- a/packaging/solaris/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -# Any files in this directory are auxiliary files for Solaris "pkg" packages. -# They will be configured during "pkg" creation, not during (binary) build. - -IF(NOT CMAKE_SYSTEM_NAME MATCHES "SunOS") - RETURN() -ENDIF() - -# Currently, this expands to "support-files/" in most layouts, -# but to "/usr/share/mysql/" in a RPM. -# It is important not to pollute "/usr/bin". -SET(inst_location ${INSTALL_SUPPORTFILESDIR}) - -FOREACH(script postinstall-solaris) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${script} COPYONLY ) - - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${script} - DESTINATION ${inst_location}/solaris COMPONENT Server_Scripts - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -ENDFOREACH() diff --git a/packaging/solaris/postinstall-solaris.sh b/packaging/solaris/postinstall-solaris.sh deleted file mode 100644 index b024d94f15854..0000000000000 --- a/packaging/solaris/postinstall-solaris.sh +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# Solaris post install script -# - -#if [ /usr/man/bin/makewhatis ] ; then -# /usr/man/bin/makewhatis "$BASEDIR/mysql/man" -#fi - -mygroup=mysql -myuser=mysql -mydatadir=/var/lib/mysql -basedir=@@basedir@@ - -if [ -n "$BASEDIR" ] ; then - basedir="$BASEDIR" -fi - -# What MySQL calls "basedir" and what pkgadd tools calls "basedir" -# is not the same thing. The default pkgadd base directory is /opt/mysql, -# the MySQL one "/opt/mysql/mysql". - -mybasedir="$basedir/@@instdir@@" -mystart1="$mybasedir/support-files/mysql.server" -myinstdb="$mybasedir/scripts/mysql_install_db" -mystart=/etc/init.d/mysql - -# Check: Is this a first installation, or an upgrade ? - -if [ -d "$mydatadir/mysql" ] ; then - : # If the directory for system table files exists, we assume an upgrade. -else - INSTALL=new # This is a new installation, the directory will soon be created. -fi - -# Create data directory if needed - -[ -d "$mydatadir" ] || mkdir -p -m 755 "$mydatadir" || exit 1 -[ -d "$mydatadir/mysql" ] || mkdir "$mydatadir/mysql" || exit 1 -[ -d "$mydatadir/test" ] || mkdir "$mydatadir/test" || exit 1 - -# Set the data directory to the right user/group - -chown -R $myuser:$mygroup $mydatadir - -# Solaris patch 119255 (somewhere around revision 42) changes the behaviour -# of pkgadd to set TMPDIR internally to a root-owned install directory. This -# has the unfortunate side effect of breaking running mysql_install_db with -# the --user=mysql argument as mysqld uses TMPDIR if set, and is unable to -# write temporary tables to that directory. To work around this issue, we -# create a subdirectory inside TMPDIR (if set) for mysqld to write to. -# -# Idea from Ben Hekster in bug#31164 - -if [ -n "$TMPDIR" ] ; then - savetmpdir="$TMPDIR" - TMPDIR="$TMPDIR/mysql.$$" - export TMPDIR - mkdir "$TMPDIR" - chown $myuser:$mygroup "$TMPDIR" -fi - -if [ -n "$INSTALL" ] ; then - # We install/update the system tables - ( - cd "$mybasedir" - scripts/mysql_install_db \ - --rpm \ - --user=mysql \ - --basedir="$mybasedir" \ - --datadir=$mydatadir - ) -fi - -if [ -n "$savetmpdir" ] ; then - TMPDIR="$savetmpdir" -fi - -# ---------------------------------------------------------------------- - -# Handle situation there is old start script installed already - -# If old start script is a soft link, we just remove it -[ -h "$mystart" ] && rm -f "$mystart" - -# If old start script is a file, we rename it -[ -f "$mystart" ] && mv -f "$mystart" "$mystart.old.$$" - -# ---------------------------------------------------------------------- - -# We create a copy of an unmodified start script, -# as a reference for the one maybe modifying it - -cp -f "$mystart1.in" "$mystart.in" || exit 1 - -# We rewrite some scripts - -for script in "$mystart" "$mystart1" "$myinstdb" ; do - script_in="$script.in" - sed -e "s,@basedir@,$mybasedir,g" \ - -e "s,@datadir@,$mydatadir,g" "$script_in" > "$script" - chmod u+x $script -done - -rm -f "$mystart.in" - -exit 0 -