1 files changed, 8 insertions, 13 deletions
diff --git a/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
index 5d53de0b4146..83bd07f0bf34 100644
--- a/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
@@ -1,4 +1,4 @@
---- scripts/CMakeLists.txt.orig	2016-03-24 09:12:11 UTC
+--- scripts/CMakeLists.txt.orig	2016-07-14 01:10:23 UTC
 +++ scripts/CMakeLists.txt
 @@ -73,6 +73,7 @@ IF(UNIX)
  )
@@ -8,7 +8,7 @@
  INSTALL(FILES 
    ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
    ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -82,6 +83,7 @@ INSTALL(FILES 
+@@ -83,6 +84,7 @@ INSTALL(FILES 
    ${FIX_PRIVILEGES_SQL}
    DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
  )
@@ -16,7 +16,7 @@
  
  # TCMalloc hacks
  IF(MALLOC_LIB)
-@@ -134,6 +136,7 @@ ENDIF()
+@@ -135,6 +137,7 @@ ENDIF()
  SET(HOSTNAME "hostname")
  SET(MYSQLD_USER "mysql")
  
@@ -24,7 +24,7 @@
  # Required for mysqlbug until autotools are deprecated, once done remove these
  # and expand default cmake variables
  SET(CC ${CMAKE_C_COMPILER})
-@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
+@@ -169,6 +172,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
    DESTINATION ${INSTALL_BINDIR}
    COMPONENT Server
    )
@@ -32,7 +32,7 @@
  
  ENDIF(UNIX)
  
-@@ -193,6 +197,7 @@ ELSE()
+@@ -194,6 +198,7 @@ ELSE()
    SET(localstatedir ${MYSQL_DATADIR})
  ENDIF()
  
@@ -40,7 +40,7 @@
  IF(UNIX)
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
    ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
-@@ -206,6 +211,7 @@ INSTALL_SCRIPT(
+@@ -207,6 +212,7 @@ INSTALL_SCRIPT(
    COMPONENT Server
    )
  ENDIF()
@@ -48,22 +48,17 @@
  
  SET(prefix "${CMAKE_INSTALL_PREFIX}")
  IF(INSTALL_SYSCONFDIR)
-@@ -284,18 +290,8 @@ ELSE()
+@@ -294,13 +300,8 @@ ELSE()
    SET(BIN_SCRIPTS
      msql2mysql
      mysql_config
--    mysql_fix_extensions
 -    mysql_setpermission
 -    mysql_secure_installation
--    mysql_zap
      mysqlaccess
 -    mysql_convert_table_format
      mysql_find_rows
 -    mytop
 -    mysqlhotcopy
--    mysqldumpslow
--    mysqld_multi
--    mysqld_safe
+     ${SERVER_SCRIPTS}
      ${WSREP_BINARIES}
      ${SYSTEMD_SCRIPTS}
-   )