MDEV-8296 MSVS 2013 & WiX 3.9

removed unused directory

27 files changed, 0 insertions, 4603 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b274f80b773..0adbb85d431 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 847dc6cdbed..00000000000
--- a/packaging/WiX/AdminBackground.jpg
+++ /dev/null
diff --git a/packaging/WiX/AdminHeader.jpg b/packaging/WiX/AdminHeader.jpg
deleted file mode 100644
index 6e2e33d404f..00000000000
--- a/packaging/WiX/AdminHeader.jpg
+++ /dev/null
diff --git a/packaging/WiX/CMakeLists.txt b/packaging/WiX/CMakeLists.txt
deleted file mode 100644
index a5970703720..00000000000
--- a/packaging/WiX/CMakeLists.txt
+++ /dev/null
@@ -1,119 +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
-
-IF(NOT WIN32)
-  RETURN()
-ENDIF()
-
-FIND_PATH(WIX_DIR heat.exe
-   $ENV{WIX_DIR}/bin
-   $ENV{ProgramFiles}/wix/bin
-  "$ENV{ProgramFiles}/Windows Installer XML v3/bin"
-  "$ENV{ProgramFiles}/Windows Installer XML v3.5/bin"
-)
-
-IF(NOT WIX_DIR)
-  IF(NOT _WIX_DIR_CHECKED)
-    SET(_WIX_DIR_CHECKED 1 CACHE INTERNAL "")
-    MESSAGE(STATUS "Cannot find wix 3, installer project will not be generated")
-  ENDIF()
-  RETURN()
-ENDIF()
-
-ADD_SUBDIRECTORY(ca)
-
-# extra.wxs.in needs DATADIR_MYSQL_FILES and DATADIR_PERFORMANCE_SCHEMA_FILES, i.e
-# Wix-compatible file lists for ${builddir}\sql\data\{mysql,performance_schema}
-
-FOREACH(dir mysql performance_schema)
- FILE(GLOB files ${CMAKE_BINARY_DIR}/sql/data/${dir}/*)
- SET(filelist)
- FOREACH(f ${files})
-   IF(NOT f MATCHES ".rule")
-   FILE(TO_NATIVE_PATH "${f}" file_native_path)
-   GET_FILENAME_COMPONENT(file_name "${f}" NAME)
-   SET(filelist 
-"${filelist}
-<File Id='${file_name}' Source='${file_native_path}'/>")
-   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 9caae8375d8..00000000000
--- 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 a471afcda95..00000000000
--- a/packaging/WiX/MySQLServer.ico
+++ /dev/null
diff --git a/packaging/WiX/ca/CMakeLists.txt b/packaging/WiX/ca/CMakeLists.txt
deleted file mode 100644
index 81622a1d158..00000000000
--- 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 444e003c3f2..00000000000
--- 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 <windows.h>
-#include <winreg.h>
-#include <msi.h>
-#include <msiquery.h>
-#include <wcautil.h>
-#include <string.h>
-#include <strsafe.h>
-
-/*
- * 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 5f5e6630013..00000000000
--- 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 d0a8f0046cf..00000000000
--- 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}
-   <Feature  Id='${f_upper}'
-     Title='${TITLE}'
-     Description='${DESCRIPTION}'
-     ConfigurableDirectory='INSTALLDIR'
-     Level='${Level}' ${DISPLAY} >"
-  )
- 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} 
-     <ComponentGroupRef Id='componentgroup.${c}'/>")
-   ELSE()
-   SET(CPACK_WIX_FEATURES
-   "${CPACK_WIX_FEATURES} 
-    <Feature Id='${c}' 
-       Title='${TITLE}'
-       Description='${DESCRIPTION}'
-       ConfigurableDirectory='INSTALLDIR'
-       Level='${Level}'>
-       <ComponentGroupRef Id='componentgroup.${c}'/>
-    </Feature>")
-  ENDIF()
-  
-  ENDFOREACH()
-   SET(CPACK_WIX_FEATURES
-   "${CPACK_WIX_FEATURES}
-   </Feature>
-   ") 
-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} "<DirectoryRef Id='${DirectoryRefId}'>\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} "  <Component Id='C.${id}' Guid='*' ${Win64}>\n")
-	  FILE(APPEND ${file} "    <File Id='F.${id}' KeyPath='yes' Source='${f_native}'/>\n")
-	  FILE(APPEND ${file} "  </Component>\n")
-	  FILE(APPEND ${file_comp} "  <ComponentRef Id='C.${id}'/>\n")
-       ELSE()
-	SET(NONEXEFILES  "${NONEXEFILES}\n<File Id='F.${id}' Source='${f_native}'/>" )
-	ENDIF()
-      ENDIF()
-    ENDIF()
-  ENDFOREACH()
-  FILE(APPEND ${file} "</DirectoryRef>\n")
-  IF(NONEXEFILES)
-    GENERATE_GUID(guid)
-    SET(ComponentId "C._files_${COMP_NAME}.${DirectoryRefId}")
-    FILE(APPEND ${file} 
-    "<DirectoryRef Id='${DirectoryRefId}'>\n<Component Guid='${guid}' Id='${ComponentId}' ${Win64}>${NONEXEFILES}\n</Component></DirectoryRef>\n")
-	FILE(APPEND ${file_comp} "  <ComponentRef Id='${ComponentId}'/>\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}<Directory Id='D.${id}' Name='${name}'>\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}</Directory>\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  "<ComponentGroup Id='componentgroup.${d_name}'>")
-  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   "</ComponentGroup>")
-  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 "<DirectoryRef Id='INSTALLDIR'>\n")
-TRAVERSE_DIRECTORIES(${abs}/dirs ${abs}/dirs directories.wxs "")
-FILE(APPEND directories.wxs "</DirectoryRef>\n")
-
-FILE(READ directories.wxs CPACK_WIX_DIRECTORIES)
-FILE(REMOVE directories.wxs)
-
-
-FOREACH(src ${CPACK_WIX_INCLUDE})
-SET(CPACK_WIX_INCLUDES 
-"${CPACK_WIX_INCLUDES}
- <?include ${src}?>"
-)
-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 0ccd30f6754..00000000000
--- a/packaging/WiX/custom_ui.wxs
+++ /dev/null
@@ -1,115 +0,0 @@
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
-         xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-<!--
-   Copyright (c) 2010, 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; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--->
-
-  <UI Id="WixUI_Mondo_Custom">
-    <Dialog Id="CustomWelcomeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
-      <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-        <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-      </Control>
-      <Control Id="Next" Type="PushButton" X="220" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
-        <Publish Event="NewDialog" Value="LicenseAgreementDlg">NOT OLDERVERSIONBEINGUPGRADED</Publish>
-        <Publish Event="NewDialog" Value="UpgradeDlg">OLDERVERSIONBEINGUPGRADED</Publish>
-	  </Control>	  
-      <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
-      <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
-      <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
-      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved." />
-      <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
-      <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-    </Dialog>
-
-    <Dialog Id="UpgradeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
-      <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes"  Text="Upgrade">
-        <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-        <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-        <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-        <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-        <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-      </Control>
-      <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-        <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-      </Control>
-      <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
-        <Condition Action="default">WixUI_InstallMode = "Remove"</Condition>
-      </Control>
-      <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)">
-        <Condition Action="show">NOT Installed</Condition>
-      </Control>
-      <Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)">
-        <Condition Action="show">NOT Installed</Condition>
-      </Control>
-      <Control Id="UpgradeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="no" NoPrefix="yes"
-      Text="Click Upgrade to upgrade your installation from version [OLDERVERSION] to version [ProductVersion]. Click Cancel to exit the upgrade."/>
-      <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" />
-      <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-      <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-    </Dialog>
-
-    <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
-    <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
-    <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-
-    <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-    <Property Id="WixUI_Mode" Value="Mondo" />
-
-    <DialogRef Id="ErrorDlg" />
-    <DialogRef Id="FatalError" />
-    <DialogRef Id="FilesInUse" />
-    <DialogRef Id="MsiRMFilesInUse" />
-    <DialogRef Id="PrepareDlg" />
-    <DialogRef Id="ProgressDlg" />
-    <DialogRef Id="ResumeDlg" />
-    <DialogRef Id="UserExit" />
-
-    <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-
-    <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
-    <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish>
-
-    <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
-    <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-    <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
-    <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-
-    <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>
-    <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
-    <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-
-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
-
-    <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
-    <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
-    <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-    <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-    <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
-    <Publish Dialog="UpgradeDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
-	
-    <InstallUISequence>
-      <Show Dialog="CustomWelcomeDlg" Before="ProgressDlg">NOT Installed</Show>
-    </InstallUISequence>
-  </UI>
-
-  <UIRef Id="WixUI_Common" />
-</Include>
diff --git a/packaging/WiX/extra.wxs.in b/packaging/WiX/extra.wxs.in
deleted file mode 100644
index 92a79064d54..00000000000
--- a/packaging/WiX/extra.wxs.in
+++ /dev/null
@@ -1,81 +0,0 @@
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
-         xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-<!--
-   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
--->
-
-  <!-- Datafiles that installation will copy to CommonAppData (initial database)
-  They are declared Permanent and NeverOverwrite since it is user data -->
-  <DirectoryRef Id='TARGETDIR'>
-    <Directory Id="CommonAppDataFolder">
-      <Directory Id="datadir.mysql" Name="MySQL">
-        <Directory Id="datadir.mysql.mysqlserver"
-          Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@">
-          <Directory Id="DATADIR" Name=".">
-            <Component Id="component.datadir" Guid="d3491319-5dbc-4477-95f3-4f809ef1dd2d">
-              <CreateFolder>
-                <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
-              </CreateFolder>
-            </Component>
-            <Directory Id="datadir.mysql.mysqlserver.data" Name="data">
-              <Directory Id="datadir.mysql.mysqlserver.data.mysql" Name="mysql">
-                <Component Id="component.datadir.mysql"
-                  Guid="19ec0f1f-1a7f-424e-a788-b09346c0a709"
-                  Permanent="yes" NeverOverwrite="yes">
-                  <CreateFolder>
-                    <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
-                  </CreateFolder>
-                  @DATADIR_MYSQL_FILES@
-                </Component>
-              </Directory>
-              <Directory Id="datadir.mysql.mysqlserver.data.performance_schema"
-                 Name="performance_schema">
-                <Component Id="component.datadir.performance_schema"
-                  Guid="af2a6776-2655-431f-a748-9e9f4645acc3"
-                  Permanent="yes" NeverOverwrite="yes">
-                  <CreateFolder>
-                    <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
-                  </CreateFolder>
-                  @DATADIR_PERFORMANCE_SCHEMA_FILES@
-                </Component>
-              </Directory>
-              <Directory Id="datadir.mysql.mysqlserver.data.test" Name="test">
-                <Component Id="component.datadir.test" Guid="52fa9f0a-fcd1-420a-b2ac-95a8f70ad20a">
-                  <CreateFolder/>
-                </Component>
-              </Directory>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-  </DirectoryRef>
-
-  <Feature Id='UserEditableDataFiles' 
-       Title='Server data files'
-       Description='Server data files'
-       ConfigurableDirectory='DATADIR'
-       Level='1'>
-    <ComponentRef Id="component.datadir"/>
-    <ComponentRef Id="component.datadir.mysql"/>
-    <ComponentRef Id="component.datadir.performance_schema"/>
-    <ComponentRef Id="component.datadir.test"/>
-  </Feature>
-</Include>
-
-
-
diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in
deleted file mode 100644
index 1e7c20468ef..00000000000
--- a/packaging/WiX/mysql_server.wxs.in
+++ /dev/null
@@ -1,196 +0,0 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" 
-      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-<!--
-   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
--->
-
-  <Product 
-    Id="*" 
-    UpgradeCode="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3"
-    Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@" 
-    Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" 
-    Language="1033" 
-    Manufacturer="@MANUFACTURER@">
-    
-    <Package Id='*'
-       Keywords='Installer'
-       Description="MySQL Database Server"
-       Manufacturer='@MANUFACTURER@'
-       InstallerVersion='200'
-       Languages='1033'
-       Compressed='yes'
-       SummaryCodepage='1252'
-       Platform='@Platform@'
-       InstallScope="perMachine"/>
-  
-    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
-
-    <!-- Upgrade -->
-    <Upgrade Id="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3">
-      <UpgradeVersion 
-        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"
-        IncludeMinimum="yes"
-        Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
-        IncludeMaximum="yes"
-        Property="OLDERVERSIONBEINGUPGRADED"
-        MigrateFeatures="yes"
-        />
-      <UpgradeVersion 
-        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
-        IncludeMinimum="no"
-        OnlyDetect="yes"
-        Property="NEWERVERSIONDETECTED" />
-    </Upgrade>
-    <Condition Message="A later version of [ProductName] is already installed. Setup will now exit.">
-      NOT NEWERVERSIONDETECTED OR Installed
-    </Condition>
-    <InstallExecuteSequence>
-      <RemoveExistingProducts After="InstallInitialize"/>
-    </InstallExecuteSequence>
-
-    <!-- Save/restore install location -->
-    <CustomAction Id="SaveTargetDir" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
-    <InstallExecuteSequence>
-      <Custom Action="SaveTargetDir" After="InstallValidate">
-        NOT
-        Installed
-      </Custom>
-    </InstallExecuteSequence>
-    <InstallUISequence>
-      <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts -->
-      <AppSearch After="FindRelatedProducts"/>
-    </InstallUISequence>
- 
-    <!-- Find previous installation -->
-    <Property Id="INSTALLDIR">
-      <RegistrySearch Id="FindInstallLocation"
-          Root="HKLM"
-          Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
-          Name="InstallLocation"
-          Type="raw" />
-    </Property>
-    <?if @Platform@ != "x64" ?>
-        <Property Id="OLDERVERSION"> 
-          <RegistrySearch Id="FindOlderVersion"
-            Root="HKLM"
-            Win64 = "no"
-            Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
-            Name="DisplayVersion"
-            Type="raw" />
-        </Property>
-    <?else ?>
-        <Property Id="OLDERVERSION"> 
-          <RegistrySearch Id="FindOlderVersion"
-            Root="HKLM"
-            Win64 = "yes"
-            Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
-            Name="DisplayVersion"
-            Type="raw" />
-        </Property>
-    <?endif ?>
-    <Property Id="DATADIR">
-      <RegistrySearch Id="FindDataDir"
-          Root="HKLM"
-          Key="SOFTWARE\MySQL AB\[ProductName]"
-          Name="DataLocation"
-          Type="raw" />
-    </Property>
-    <Property Id="INSTALLDIR2">
-       <RegistrySearch Id="FindInstallLocation2"
-          Root="HKLM"
-          Key="SOFTWARE\MySQL AB\[ProductName]"
-          Name="Location"
-          Type="raw" />
-    </Property>
-    <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" /> 
-    <InstallUISequence>
-    <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom> 
-    </InstallUISequence>
-
-
-    <!-- UI -->
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
-    <UIRef Id="@CPACK_WIX_UI@" />
-    <UIRef Id="WixUI_ErrorProgressText" />
-    <WixVariable
-      Id="WixUIBannerBmp"
-      Value="@CMAKE_CURRENT_SOURCE_DIR@/AdminHeader.jpg" />
-    <WixVariable
-      Id="WixUIDialogBmp"
-      Value="@CMAKE_CURRENT_SOURCE_DIR@/AdminBackground.jpg" />
-    <Icon
-      Id="icon.ico"
-      SourceFile="@CMAKE_CURRENT_SOURCE_DIR@/MySQLServer.ico"/>
-    <Property
-      Id="ARPPRODUCTICON"
-      Value="icon.ico" />
-    
-    <!-- License -->
-    <WixVariable
-      Id="WixUILicenseRtf"
-      Value="@COPYING_RTF@"/>
-
-    <!-- How to remove the service on uninstall -->
-    <Binary Id='wixca.dll' SourceFile='@WIXCA_LOCATION@' />
-    <CustomAction Id="UnregisterProperty" Property="UnregisterService" Value="[INSTALLDIR]" Return="check" />
-    <CustomAction Id="UnregisterPropertySilent" Property="UnregisterServiceSilently" Value="[INSTALLDIR]" Return="check" />
-    <CustomAction Id="UnregisterService"
-                  BinaryKey="wixca.dll"
-                  DllEntry="RemoveService"
-                  Execute="deferred"
-                  Impersonate="no"
-                  Return="check" />
-    <CustomAction Id="UnregisterServiceSilently"
-                  BinaryKey="wixca.dll"
-                  DllEntry="RemoveServiceNoninteractive"
-                  Execute="deferred"
-                  Impersonate="no"
-                  Return="check" />
-    <InstallExecuteSequence>
-      <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
-      <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
-      <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&gt;4</Custom>
-      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&lt;=4</Custom>
-    </InstallExecuteSequence>
-
-    <!-- Installation root-->
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='@PlatformProgramFilesFolder@'>
-        <Directory Id='directory.MySQL' Name='MySQL'>
-          <Directory Id='INSTALLDIR' Name='MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@'>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-    
-    <!-- CPACK_WIX_FEATURES -->
-    @CPACK_WIX_FEATURES@
-    
-    <!-- CPACK_WIX_DIRECTORIES -->
-    @CPACK_WIX_DIRECTORIES@
-    
-    <!--CPACK_WIX_COMPONENTS-->
-    @CPACK_WIX_COMPONENTS@
-    
-    <!--CPACK_WIX_COMPONENTS_GROUPS -->
-    @CPACK_WIX_COMPONENT_GROUPS@
-    
-    <!--CPACK_WIX_INCLUDES -->
-    @CPACK_WIX_INCLUDES@
-  </Product>
-
-</Wix>
diff --git a/packaging/rpm-oel/CMakeLists.txt b/packaging/rpm-oel/CMakeLists.txt
deleted file mode 100644
index 95249a9404f..00000000000
--- 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 bc166bd82d0..00000000000
--- 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 3fdf43870fa..00000000000
--- 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 b8ee584d485..00000000000
--- 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 75dc5e1d754..00000000000
--- 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 ce5455ee29b..00000000000
--- 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 8670f889574..00000000000
--- 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 74cd5f836e7..00000000000
--- 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 79c8a8daa7d..00000000000
--- 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 bb232fb404d..00000000000
--- 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 <mysql-build@oss.oracle.com>
-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 <balasubramanian.kandasamy@oracle.com> - 5.5.39-5
-- Provide mysql-compat-server dependencies
-
-* Tue Jul 08 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-4
-- Remove perl(GD) and dtrace dependencies 
-
-* Tue Jul 01 2014 Bjorn Munch <bjorn.munch@oracle.com> - 5.5.39-3
-- Disable dtrace, as it fails on OEL6 boxes with Oracle dtrace installed
-
-* Thu Jun 26 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-2
-- Resolve embedded-devel conflict issue
-
-* Wed Jun 25 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-1
-- Add bench package
-- Enable dtrace 
-
-* Sun May 11 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.38-2
-- Increment release version to resolve upgrade conflict issue
-
-* Thu Apr 24 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.38-1
-- Updated for 5.5.38
-
-* Mon Apr 07 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-6
-- Fix Cflags for el7 
-
-* Mon Mar 31 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-5
-- Support for enterprise packages
-- Upgrade from MySQL-* packages
-
-* Fri Mar 14 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-4
-- Resolve mysql conflict with mysql-community-client
-
-* Wed Mar 12 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-3
-- Resolve conflict with mysql-libs-compat
-
-* Thu Mar 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-2
-- Resolve conflict issues during upgrade
-
-* Mon Feb 10 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-1
-- Add support for el7 (with systemd enabled)
-- Enable shared libmysqld by cmake option
-
-* Fri Oct 25 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.35-1
-- Backport changes from 5.6
-
-* Mon Nov 05 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- 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 <bjorn.munch@oracle.com>
-
-- Replace old my-*.cnf config file examples with template my-default.cnf
-
-* Fri Oct 05 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- 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 <joerg.bruehe@oracle.com>
-
-- 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 <joerg.bruehe@oracle.com>
-
-- Add the man page for the "mysql_config_editor".
-
-* Mon Jun 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
-
-* Wed Feb 29 2012 Brajmohan Saxena <brajmohan.saxena@oracle.com>
-
-- Removal all traces of the readline library from mysql (BUG 13738013)
-
-* Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- 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 <joerg.bruehe@oracle.com>
-
-- 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 <jonathan.perkin@oracle.com>
-
-- 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 <joerg.bruehe@oracle.com>
-
-- "make_win_bin_dist" and its manual are dropped, cmake does it different.
-
-* Thu Sep 08 2011 Daniel Fischer <daniel.fischer@oracle.com>
-
-- Add mysql_plugin man page.
-
-* Tue Aug 30 2011 Tor Didriksen <tor.didriksen@oracle.com>
-
-- 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 <joerg.bruehe@oracle.com>
-
-- Add the manual page for "mysql_plugin" to the server package.
-
-* Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- 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 <daniel.fischer@oracle.com>
-
-- Source plugin library files list from cmake-generated file.
-
-* Mon Jul 25 2011 Chuck Bell <chuck.bell@oracle.com>
-
-- Added the mysql_plugin client - enables or disables plugins.
-
-* Thu Jul 21 2011 Sunanda Menon <sunanda.menon@oracle.com>
-
-- Fix bug#12561297: Added the MySQL embedded binary
-
-* Thu Jul 07 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- 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 <joerg.bruehe@oracle.com>
-
-- 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 <joerg.bruehe@oracle.com>
-
-- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN".
-
-* Tue Nov 23 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
-
-- 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 <georgi.godinov@oracle.com>
-
-- Added test authentication (WL#1054) plugin binaries
-
-* Wed Oct 6 2010 Georgi Kodinov <georgi.godinov@oracle.com>
-
-- Added example external authentication (WL#1054) plugin binaries
-
-* Wed Aug 11 2010 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- 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 <joerg.bruehe@sun.com>
-
-- 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 <jonathan.perkin@oracle.com>
-
-- Implement SELinux checks from distribution-specific spec file.
-
-* Wed May 12 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
-
-- 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 <joerg.bruehe@sun.com>
-
-- Add "--with-perfschema" to the configure options.
-
-* Mon Mar 22 2010 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- 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 <joerg.bruehe@sun.com>
-
-- Fix a wrong path name in handling the debug plugins.
-
-* Wed Mar 10 2010 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- 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 <joerg.bruehe@sun.com>
-
-- 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 <joerg.bruehe@sun.com>
-
-- 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 <joerg.bruehe@sun.com>
-
-- 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 <joerg.bruehe@sun.com>
-
-- 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 <joerg.bruehe@sun.com>
-
-- 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 <mvensson@mysql.com>
-
-- Removed mysql_fix_privilege_tables
-
-* Fri Oct 02 2009 Alexander Nozdrin <alexander.nozdrin@sun.com>
-
-- "mysqlmanager" got removed from version 5.4, all references deleted.
-
-* Fri Aug 28 2009 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin.
-
-* Thu Aug 27 2009 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- 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 <jperkin@sun.com>
-
-- Add conditionals for bundled zlib and innodb plugin
-
-* Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
-
-- Install plugin libraries in appropriate packages.
-- Disable libdaemon_example and ftexample plugins.
-
-* Thu Aug 20 2009 Jonathan Perkin <jperkin@sun.com>
-
-- Update variable used for mysql-test suite location to match source.
-
-* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
-
-- 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 <kent.boortz@sun.com>
-
-- Removed "mysql_upgrade_shell"
-- Removed some copy/paste between debug and normal build
-
-* Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com>
-
-- 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 <kent@mysql.com>
-
-- Removed the "Federated" storage engine option, and enabled in all
-
-* Tue Aug 26 2008 Joerg Bruehe <joerg@mysql.com>
-
-- 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 <kent@mysql.com>
-
-- Made the "Federated" storage engine an option
-- Made the "Cluster" storage engine and sub packages an option
-
-* Wed Mar 19 2008 Joerg Bruehe <joerg@mysql.com>
-
-- Add the man pages for "ndbd" and "ndb_mgmd".
-
-* Mon Feb 18 2008 Timothy Smith <tim@mysql.com>
-
-- 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 <joerg@mysql.com>
-
-- "ndb_size.tmpl" is not needed any more,
-  "man1/mysql_install_db.1" lacked the trailing '*'.
-
-* Sat Apr 07 2007 Kent Boortz <kent@mysql.com>
-
-- Removed man page for "mysql_create_system_tables"
-
-* Wed Mar 21 2007 Daniel Fischer <df@mysql.com>
-
-- Add debug server.
-
-* Mon Mar 19 2007 Daniel Fischer <df@mysql.com>
-
-- 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 <joerg@mysql.com>
-
-- Add several man pages for NDB which are now created.
-
-* Fri Jan 05 2007 Kent Boortz <kent@mysql.com>
-
-- 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 <joerg@mysql.com>
-
-- Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
-
-* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>
-
-- 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 <joerg@mysql.com>
-
-- Call "make install" using "benchdir_root=%%{_datadir}",
-  because that is affecting the regression test suite as well.
-
-* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
-
-- 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 <joerg@mysql.com>
-
-- Add "--with-partition" t 2006 Joerg Bruehe <joerg@mysql.com>
-
-- 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 <joerg@mysql.com>
-
-- 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 <kent@mysql.com>
-
-- Always compile for PIC, position independent code.
-
-* Wed May 10 2006 Kent Boortz <kent@mysql.com>
-
-- 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 <kent@mysql.com>
-
-- Use "./libtool --mode=execute" instead of searching for the
-  executable in current directory and ".libs".
-
-* Fri Apr 28 2006 Kent Boortz <kent@mysql.com>
-
-- Install and run "mysql_upgrade"
-
-* Wed Apr 12 2006 Jim Winstead <jimw@mysql.com>
-
-- 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 <jimw@mysql.com>
-
-- Remove old mysqltestmanager and related programs
-* Sat Apr 01 2006 Kent Boortz <kent@mysql.com>
-
-- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
-
-* Tue Mar 07 2006 Kent Boortz <kent@mysql.com>
-
-- Changed product name from "Community Edition" to "Community Server"
-
-* Mon Mar 06 2006 Kent Boortz <kent@mysql.com>
-
-- Fast mutexes is now disabled by default, but should be
-  used in Linux builds.
-
-* Mon Feb 20 2006 Kent Boortz <kent@mysql.com>
-
-- Reintroduced a max build
-- Limited testing of 'debug' and 'max' servers
-- Berkeley DB only in 'max'
-
-* Mon Feb 13 2006 Joerg Bruehe <joerg@mysql.com>
-
-- Use "-i" on "make test-force";
-  this is essential for later evaluation of this log file.
-
-* Thu Feb 09 2006 Kent Boortz <kent@mysql.com>
-
-- 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 <knielsen@mysql.com>
-
-- Modified RPM spec to match new 5.1 debug+max combined community packaging.
-
-* Sun Dec 18 2005 Kent Boortz <kent@mysql.com>
-
-- Added "client/mysqlslap"
-
-* Mon Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com>
-
-- 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 <joerg@mysql.com>
-
-- 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 <joerg@mysql.com>
-
-- 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 <lenz@grimmer.com>
-
-- added more man pages
-
-* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
-
-- Made yaSSL support an option (off by default)
-
-* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
-
-- Enabled yaSSL support
-
-* Sat Oct 15 2005 Kent Boortz <kent@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- Fixed the Requires: tag for the server RPM (BUG 12233)
-
-* Fri Jul 15 2005 Lenz Grimmer <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- 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 <joerg@mysql.com>
-
-- Added a "make clean" between separate calls to "BuildMySQL".
-
-* Thu May 12 2005 Guilhem Bichot <guilhem@mysql.com>
-
-- Removed the mysql_tableinfo script made obsolete by the information schema
-
-* Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
-
-- Enabled the "blackhole" storage engine for the Max RPM
-
-* Wed Apr 13 2005 Lenz Grimmer <lenz@mysql.com>
-
-- 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 <petr@mysql.com>
-
-- old mysqlmanager, mysq* Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- replaced obsoleted "BuildPrereq" with "BuildRequires" instead
-
-* Thu Jan 13 2005 Lenz Grimmer <lenz@mysql.com>
-
-- enabled the "Federated" storage engine for the max binary
-
-* Tue Jan 04 2005 Petr Chardin <petr@mysql.com>
-
-- ISAM and merge storage engines were purged. As well as appropriate
-  tools and manpages (isamchk and isamlog)
-
-* Fri Dec 31 2004 Lenz Grimmer <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860)
-
-* Fri Aug 20 2004 Lenz Grimmer <lenz@mysql.com>
-
-- do not link statically on IA64/AMD64 as these systems do not have
-  a patched glibc installed
-
-* Tue Aug 10 2004 Lenz Grimmer <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- Added EXCEPTIONS-CLIENT to the "devel" package
-
-* Thu Jul 29 2004 Lenz Grimmer <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- fixed server postinstall (mysql_install_db was called with the wrong
-  parameter)
-
-* Thu Jun 24 2004 Lenz Grimmer <lenz@mysql.com>
-
-- added mysql_tzinfo_to_sql to the server subpackage
-- run "make clean" instead of "make distclean"
-
-* Mon Apr 05 2004 Lenz Grimmer <lenz@mysql.com>
-
-- added ncurses-devel to the build prerequisites (BUG 3377)
-
-* Thu Feb 12 2004 Lenz Grimmer <lenz@mysql.com>
-
-- when using gcc, _always_ use CXX=gcc
-- replaced Copyright with License field (Copyright is obsolete)
-
-* Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com>
-
-- added myisam_ftdump to the Server package
-
-* Tue Jan 13 2004 Lenz Grimmer <lenz@mysql.com>
-
-- link the mysql client against libreadline instead of libedit (BUG 2289)
-
-* Mon Dec 22 2003 Lenz Grimmer <lenz@mysql.com>
-
-- marked /etc/logrotate.d/mysql as a config file (BUG 2156)
-
-* Sat Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
-
-- fixed file permissions (BUG 1672)
-
-* Thu Dec 11 2003 Lenz Grimmer <lenz@mysql.com>
-
-- made testing for gcc3 a bit more robust
-
-* Fri Dec 05 2003 Lenz Grimmer <lenz@mysql.com>
-
-- added missing file mysql_create_system_tables to the server subpackage
-
-* Fri Nov 21 2003 Lenz Grimmer <lenz@mysql.com>
-
-- removed dependency on MySQL-client from the MySQL-devel subpackage
-  as it is not really required. (BUG 1610)
-
-* Fri Aug 29 2003 Lenz Grimmer <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- re-enabled RAID again
-
-* Wed Apr 30 2003 Lenz Grimmer <lenz@mysql.com>
-
-- disabled MyISAM RAID (--with-raid)- it throws an assertion which
-  needs to be investigated first.
-
-* Mon Mar 10 2003 Lenz Grimmer <lenz@mysql.com>
-
-- added missing file mysql_secure_installation to server subpackage
-  (BUG 141)
-
-* Tue Feb 11 2003 Lenz Grimmer <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- 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 <lenz@mysql.com>
-
-- 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 <tim@mysql.com>
-
-- Added separate libmysql_r directory; now both a threaded
-  and non-threaded library is shipped.
-
-* Tue Sep 28 1999 David Axmark <davida@mysql.com>
-
-- 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 <davida@mysql.com>
-
-- Cleaned up some for 3.23.
-
-* Thu Jul 1 1999 David Axmark <davida@mysql.com>
-
-- 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 <david@detron.se>
-
-- 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 <jorge@bestway.com.br>.
-
-* Wed Nov 4 1998 David Axmark <david@detron.se>
-
-- A lot of changes in all the rpm and install scripts. This may even
-  be a working RPM :-)
-
-* Sun Aug 16 1998 David Axmark <david@detron.se>
-
-- 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 abe46e0ed74..00000000000
--- 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 78ef3bffe60..00000000000
--- 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 899847d0f38..00000000000
--- 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 b024d94f158..00000000000
--- 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 <heksterb@gmail.com> 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
-