diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2014-03-24 20:17:52 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2014-03-24 20:17:52 +0000 |
| commit | 4e4d2b1bf79ac4addebd07a16389a1a10409c42f (patch) | |
| tree | 796b07e0fdb8d93f4a0b1ecfd95c8594bf54acc4 /databases/percona56-client/files | |
| parent | - Update to 5.5.36-34.1 (diff) | |
- Update to 5.6.16-64.1
- Also pass --defaults-extra-file to mysql_install_db [1]
Submitted by: Daniel Ylitalo <daniel@203core.se>
Diffstat (limited to 'databases/percona56-client/files')
| -rw-r--r-- | databases/percona56-client/files/patch-client_CMakeLists.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/databases/percona56-client/files/patch-client_CMakeLists.txt b/databases/percona56-client/files/patch-client_CMakeLists.txt index f3a7372b69f7..e9375523d477 100644 --- a/databases/percona56-client/files/patch-client_CMakeLists.txt +++ b/databases/percona56-client/files/patch-client_CMakeLists.txt @@ -1,38 +1,38 @@ ---- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ client/CMakeLists.txt 2013-02-13 10:36:50.000000000 +0100 -@@ -39,9 +39,11 @@ - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) +--- client/CMakeLists.txt.orig 2014-03-15 18:08:38.000000000 +0100 ++++ client/CMakeLists.txt 2014-03-22 19:41:40.272474641 +0100 +@@ -37,9 +37,11 @@ + TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +IF(FALSE) 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) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) -@@ -53,15 +55,19 @@ +@@ -51,15 +53,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) + TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) +IF(FALSE) 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) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) + TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) + TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) +ENDIF() - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -82,8 +88,6 @@ + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc + ../sql/rpl_filter.cc ../sql/sql_list.cc) +@@ -81,8 +87,6 @@ ENDIF(WIN32) SET_TARGET_PROPERTIES ( |