--- client/CMakeLists.txt.orig	2015-01-07 10:49:52.000000000 +0100
+++ client/CMakeLists.txt	2015-01-21 20:03:30.747577544 +0100
@@ -33,6 +33,7 @@
   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
 ENDIF(UNIX)
 
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
 # mysqltest has unused result errors, so we skip Werror
@@ -42,7 +43,7 @@
   ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
 ENDIF()
 TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
-
+ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
 TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
@@ -53,15 +54,19 @@
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
 
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
 TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient)
 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
+ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
 
+IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
 TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
+ENDIF()
 
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
                      ../sql/rpl_filter.cc ../sql/sql_list.cc)
@@ -79,7 +84,7 @@
   MYSQL_ADD_EXECUTABLE(echo echo.c)
 ENDIF(WIN32)
 
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
 PROPERTIES HAS_CXX TRUE)
 
 ADD_DEFINITIONS(-DHAVE_DLOPEN)