diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-03 11:47:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 17:15:59 +0200 |
| commit | 51d457f371ddf2191f48ec197e8f7364cfa071c8 (patch) | |
| tree | 13e0382ff712cc6fb4aa37203474a0ce4a02162d | |
| parent | 291411c96ceb914950731df6c36b32fc83b58acf (diff) | |
| download | mariadb-git-51d457f371ddf2191f48ec197e8f7364cfa071c8.tar.gz | |
compilation failures
with -DPLUGIN_PARTITION=NO and -DPLUGIN_PERFSCHEMA=NO
| -rw-r--r-- | sql/mysqld.cc | 8 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 12863b7ae63..871a3140891 100644 --- a/sql/mysqld.cc +++ b/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 diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index c51ae212918..22db204faa2 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/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 = |