compilation failures

with -DPLUGIN_PARTITION=NO and -DPLUGIN_PERFSCHEMA=NO

sql/mysqld.cc

@@ -79,6 +79,10 @@
 #include "sql_callback.h"
 #include "threadpool.h"
 
+#ifdef HAVE_OPENSSL
+#include <ssl_compat.h>
+#endif
+
 #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
 #include "../storage/perfschema/pfs_server.h"
 #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
@@ -338,13 +342,9 @@ static PSI_thread_key key_thread_handle_con_sockets;
 static PSI_thread_key key_thread_handle_shutdown;
 #endif /* __WIN__ */
 
-#ifdef HAVE_OPENSSL
-#include <ssl_compat.h>
-
 #ifdef HAVE_OPENSSL10
 static PSI_rwlock_key key_rwlock_openssl;
 #endif
-#endif
 #endif /* HAVE_PSI_INTERFACE */
 
 #ifdef HAVE_NPTL

storage/innobase/handler/handler0alter.cc

@@ -764,8 +764,8 @@ ha_innobase::check_if_supported_inplace_alter(
 			   | Alter_inplace_info::DROP_INDEX);
 
 		if (flags != 0
-		    || (altered_table->s->partition_info_str
-			&& altered_table->s->partition_info_str_len)
+		    || IF_PARTITIONING((altered_table->s->partition_info_str
+			&& altered_table->s->partition_info_str_len), 0)
 		    || (!check_v_col_in_order(
 			this->table, altered_table, ha_alter_info))) {
 			ha_alter_info->unsupported_reason =