- Update to 5.5.36-34.1

- Also pass --defaults-extra-file to mysql_install_db [1]

Submitted by:	Daniel Ylitalo <daniel@203core.se>

3 files changed, 21 insertions, 21 deletions

diff --git a/databases/percona55-server/files/mysql-server.in b/databases/percona55-server/files/mysql-server.in
index d2cdc080e216..245c1bdbaa85 100644
--- a/databases/percona55-server/files/mysql-server.in
+++ b/databases/percona55-server/files/mysql-server.in
@@ -46,7 +46,7 @@ procname="%%PREFIX%%/libexec/mysqld"
 start_precmd="${name}_prestart"
 start_postcmd="${name}_poststart"
 mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
+mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --defaults-extra-file=${mysql_optfile} --force"
 
 mysql_create_auth_tables()
 {
diff --git a/databases/percona55-server/files/patch-client_CMakeLists.txt b/databases/percona55-server/files/patch-client_CMakeLists.txt
index 4e9d2eb3da30..c4bebcebaec1 100644
--- a/databases/percona55-server/files/patch-client_CMakeLists.txt
+++ b/databases/percona55-server/files/patch-client_CMakeLists.txt
@@ -1,12 +1,12 @@
---- client/CMakeLists.txt.orig	2013-01-07 07:29:49.000000000 +0100
-+++ client/CMakeLists.txt	2013-01-10 23:56:53.794287046 +0100
+--- client/CMakeLists.txt.orig	2014-03-15 18:08:16.000000000 +0100
++++ client/CMakeLists.txt	2014-03-22 21:03:06.194178397 +0100
 @@ -27,17 +27,20 @@
  
  ADD_DEFINITIONS(${READLINE_DEFINES})
  ADD_DEFINITIONS(${SSL_DEFINES})
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
+ TARGET_LINK_LIBRARIES(mysql perconaserverclient)
  IF(UNIX)
    TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
  ENDIF(UNIX)
@@ -14,39 +14,39 @@
  
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
  
  
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
+ TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
  
 @@ -46,17 +49,21 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+ TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
 +ENDIF()
  
  MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
+ TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient)
  ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
  
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+ TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
 +ENDIF()
  
  MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+ TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
  
 +IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
- 
-@@ -66,13 +73,14 @@
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
+                      ../sql/rpl_filter.cc ../sql/sql_list.cc)
+ TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient)
+@@ -67,13 +74,14 @@
  MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
  SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
+ TARGET_LINK_LIBRARIES(mysqlslap perconaserverclient)
 +ENDIF()
  
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
diff --git a/databases/percona55-server/files/patch-libmysql_CMakeLists.txt b/databases/percona55-server/files/patch-libmysql_CMakeLists.txt
index 20f1983fafbd..a60338ddc992 100644
--- a/databases/percona55-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/percona55-server/files/patch-libmysql_CMakeLists.txt
@@ -1,11 +1,11 @@
---- libmysql/CMakeLists.txt.orig	2014-01-19 11:47:44.423382348 -0500
-+++ libmysql/CMakeLists.txt	2014-01-19 12:08:16.021297429 -0500
+--- libmysql/CMakeLists.txt.orig	2014-03-15 18:08:16.000000000 +0100
++++ libmysql/CMakeLists.txt	2014-03-22 19:37:32.145100925 +0100
 @@ -165,7 +165,7 @@
  
- # Merge several convenience libraries into one big mysqlclient
+ # Merge several convenience libraries into one big perconaserverclient
  # and link them together into shared library.
--MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
+-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
++MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
  
  # Visual Studio users need debug  static library for debug projects
  INSTALL_DEBUG_SYMBOLS(clientlib)
@@ -19,7 +19,7 @@
      SET(DOT_VERSION ".${VERSION}")
 @@ -188,9 +189,11 @@
    ENDMACRO()
-   INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
+   INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a perconaserverclient ${INSTALL_LIBDIR} Development)
  ENDIF()
 +ENDIF()