Merge pull request #6906 from amosbird/bf2

Fix non-ssl build.

dbms/programs/server/MySQLHandler.cpp

@@ -1,3 +1,5 @@
+#include <Common/config.h>
+#if USE_POCO_NETSSL
 #include "MySQLHandler.h"
 
 #include <limits>
@@ -301,3 +303,4 @@ void MySQLHandler::comQuery(ReadBuffer & payload)
 }
 
 }
+#endif

dbms/programs/server/MySQLHandler.h

@@ -1,4 +1,6 @@
 #pragma once
+#include <Common/config.h>
+#if USE_POCO_NETSSL
 
 #include <Poco/Net/TCPServerConnection.h>
 #include <Poco/Net/SecureStreamSocket.h>
@@ -56,3 +58,4 @@ private:
 };
 
 }
+#endif

dbms/programs/server/MySQLHandlerFactory.cpp

@@ -1,3 +1,5 @@
+#include <Common/config.h>
+#if USE_POCO_NETSSL
 #include <Common/OpenSSLHelpers.h>
 #include <Poco/Crypto/X509Certificate.h>
 #include <Poco/Net/SSLManager.h>
@@ -122,3 +124,4 @@ Poco::Net::TCPServerConnection * MySQLHandlerFactory::createConnection(const Poc
 }
 
 }
+#endif

dbms/programs/server/MySQLHandlerFactory.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <Common/config.h>
+#if USE_POCO_NETSSL
+
 #include <Poco/Net/TCPServerConnectionFactory.h>
 #include <atomic>
 #include <openssl/rsa.h>
@@ -37,3 +40,4 @@ public:
 };
 
 }
+#endif

dbms/src/Common/OpenSSLHelpers.cpp

@@ -1,3 +1,5 @@
+#include <Common/config.h>
+#if USE_POCO_NETSSL
 #include "OpenSSLHelpers.h"
 #include <ext/scope_guard.h>
 #include <openssl/err.h>
@@ -16,3 +18,4 @@ String getOpenSSLErrors()
 }
 
 }
+#endif

dbms/src/Common/OpenSSLHelpers.h

@@ -1,4 +1,6 @@
 #pragma once
+#include <Common/config.h>
+#if USE_POCO_NETSSL
 
 #include <Core/Types.h>
 
@@ -10,3 +12,4 @@ namespace DB
 String getOpenSSLErrors();
 
 }
+#endif

dbms/src/Core/MySQLProtocol.cpp

@@ -1,3 +1,5 @@
+#include <Common/config.h>
+#if USE_POCO_NETSSL
 #include <IO/WriteBuffer.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromString.h>
@@ -100,3 +102,4 @@ size_t getLengthEncodedStringSize(const String & s)
 }
 
 }
+#endif

dbms/src/Core/MySQLProtocol.h

@@ -1,4 +1,6 @@
 #pragma once
+#include <Common/config.h>
+#if USE_POCO_NETSSL
 
 #include <ext/scope_guard.h>
 #include <openssl/pem.h>
@@ -1075,3 +1077,4 @@ private:
 
 }
 }
+#endif

dbms/src/Formats/FormatFactory.cpp

@@ -1,3 +1,4 @@
+#include <Common/config.h>
 #include <Common/Exception.h>
 #include <Interpreters/Context.h>
 #include <Core/Settings.h>
@@ -312,7 +313,9 @@ FormatFactory::FormatFactory()
     registerOutputFormatProcessorODBCDriver(*this);
     registerOutputFormatProcessorODBCDriver2(*this);
     registerOutputFormatProcessorNull(*this);
+#if USE_POCO_NETSSL
     registerOutputFormatProcessorMySQLWrite(*this);
+#endif
 }
 
 FormatFactory & FormatFactory::instance()

dbms/src/Processors/Formats/Impl/MySQLOutputFormat.cpp

@@ -1,3 +1,5 @@
+#include <Common/config.h>
+#if USE_POCO_NETSSL
 #include <Processors/Formats/Impl/MySQLOutputFormat.h>
 
 #include <Core/MySQLProtocol.h>
@@ -116,3 +118,4 @@ void registerOutputFormatProcessorMySQLWrite(FormatFactory & factory)
 }
 
 }
+#endif

dbms/src/Processors/Formats/Impl/MySQLOutputFormat.h

@@ -1,4 +1,6 @@
 #pragma once
+#include <Common/config.h>
+#if USE_POCO_NETSSL
 
 #include <Processors/Formats/IRowOutputFormat.h>
 #include <Core/Block.h>
@@ -40,3 +42,4 @@ private:
 };
 
 }
+#endif