Bug#28501563 CMAKE -DWITHOUT_SERVER=1 IS BROKEN

A few recent build errors when building client-only
 - performance schema mismatch
 - router plugin should be excluded

Change-Id: I74b2c8c825c1b0b847b1ea07cba225287e0f5685

Author: Tor Didriksen

CMakeLists.txt

@@ -1040,7 +1040,9 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
     ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc)
 
 # depends on mysql_version.h to exist
-ADD_SUBDIRECTORY(router)
+IF(NOT WITHOUT_SERVER)
+  ADD_SUBDIRECTORY(router)
+ENDIF()
 
 GET_PROPERTY(CWD_DEFINITIONS DIRECTORY PROPERTY COMPILE_DEFINITIONS)
 CONFIGURE_FILE(

client/mysqlbinlog.cc

@@ -2424,8 +2424,11 @@ class Mysqlbinlog_ifile : public Basic_binlog_ifile {
 
   Basic_seekable_istream *open_file(const char *file_name) override {
     if (file_name && strcmp(file_name, "-") != 0) {
-      if (m_iocache.open(PSI_NOT_INSTRUMENTED, PSI_NOT_INSTRUMENTED, file_name,
-                         MYF(MY_WME | MY_NABP))) {
+      if (m_iocache.open(
+#ifdef HAVE_PSI_INTERFACE
+              PSI_NOT_INSTRUMENTED, PSI_NOT_INSTRUMENTED,
+#endif
+              file_name, MYF(MY_WME | MY_NABP))) {
         return nullptr;
       }
       return &m_iocache;

plugin/group_replication/src/plugin_psi.cc

@@ -434,10 +434,13 @@ void register_group_replication_rwlock_psi_keys(PSI_rwlock_info *keys,
   mysql_rwlock_register(category, keys, static_cast<int>(count));
 }
 
-void register_group_replication_stage_psi_keys(PSI_stage_info **keys,
-                                               size_t count) {
+void register_group_replication_stage_psi_keys(
+    PSI_stage_info **keys MY_ATTRIBUTE((unused)),
+    size_t count MY_ATTRIBUTE((unused))) {
+#ifdef HAVE_PSI_STAGE_INTERFACE
   const char *category = "group_rpl";
   mysql_stage_register(category, keys, static_cast<int>(count));
+#endif
 }
 
 void register_all_group_replication_psi_keys() {

sql/basic_istream.cc

@@ -24,20 +24,22 @@ IO_CACHE_istream::~IO_CACHE_istream() { close(); }
 
 bool IO_CACHE_istream::open(
 #ifdef HAVE_PSI_INTERFACE
-    PSI_file_key log_file_key, PSI_file_key log_cache_key,
+    PSI_file_key log_file_key MY_ATTRIBUTE((unused)),
+    PSI_file_key log_cache_key,
 #endif
-    const char *file_name, myf flags, size_t cache_size) {
+    const char *file_name, myf flags MY_ATTRIBUTE((unused)),
+    size_t cache_size) {
   File file = -1;
 
   file = mysql_file_open(log_file_key, file_name, O_RDONLY, MYF(MY_WME));
   if (file < 0) return true;
 
 #ifdef HAVE_PSI_INTERFACE
-  if (init_io_cache_ext(&m_io_cache, file, cache_size, READ_CACHE, 0, 0, flags,
-                        log_cache_key))
+  if (init_io_cache_ext(&m_io_cache, file, cache_size, READ_CACHE, 0, false,
+                        flags, log_cache_key))
 #else
-  if (init_io_cache(&m_io_cache, file, IO_SIZE * 2, READ_CACHE, 0,
-                    0 MYF(MY_WME | MY_DONT_CHECK_FILESIZE)))
+  if (init_io_cache(&m_io_cache, file, cache_size, READ_CACHE, 0, false,
+                    MYF(MY_WME | MY_DONT_CHECK_FILESIZE)))
 #endif
   {
     mysql_file_close(file, MYF(0));

sql/basic_ostream.cc

@@ -25,7 +25,7 @@ IO_CACHE_ostream::~IO_CACHE_ostream() { close(); }
 
 bool IO_CACHE_ostream::open(
 #ifdef HAVE_PSI_INTERFACE
-    PSI_file_key log_file_key,
+    PSI_file_key log_file_key MY_ATTRIBUTE((unused)),
 #endif
     const char *file_name, myf flags) {
   File file = -1;