diff --git a/dbms/include/DB/Client/ConnectionPool.h b/dbms/include/DB/Client/ConnectionPool.h
index 062c83b5a33..11a6eb14afa 100644
--- a/dbms/include/DB/Client/ConnectionPool.h
+++ b/dbms/include/DB/Client/ConnectionPool.h
@@ -28,11 +28,11 @@ public:
 	typedef PoolBase<Connection>::Entry Entry;
 	virtual Entry get(Settings * settings = nullptr) = 0;
 
-	/** Выделяет до указанного количества соединений для работы. 
+	/** Выделяет до указанного количества соединений для работы.
 	  * Соединения предоставляют доступ к разным репликам одного шарда.
 	  * Выкидывает исключение, если не удалось выделить ни одного соединения.
 	  */
-	virtual std::vector<Entry> getMany(Settings * settings = nullptr) 
+	virtual std::vector<Entry> getMany(Settings * settings = nullptr)
 	{
 		return std::vector<Entry>{ get(settings) };
 	}
diff --git a/dbms/include/DB/Client/ConnectionPoolWithFailover.h b/dbms/include/DB/Client/ConnectionPoolWithFailover.h
index 04c7ed296f1..4057cd51675 100644
--- a/dbms/include/DB/Client/ConnectionPoolWithFailover.h
+++ b/dbms/include/DB/Client/ConnectionPoolWithFailover.h
@@ -57,7 +57,7 @@ public:
 		return Base::get(settings);
 	}
 
-	/** Выделяет до указанного количества соединений для работы. 
+	/** Выделяет до указанного количества соединений для работы.
 	  * Соединения предоставляют доступ к разным репликам одного шарда.
 	  */
 	std::vector<Entry> getMany(Settings * settings = nullptr) override
diff --git a/dbms/include/DB/Core/ErrorCodes.h b/dbms/include/DB/Core/ErrorCodes.h
index d28ad0e66cb..969a65e1d0a 100644
--- a/dbms/include/DB/Core/ErrorCodes.h
+++ b/dbms/include/DB/Core/ErrorCodes.h
@@ -271,6 +271,7 @@ namespace ErrorCodes
 		UNKNOWN_BLOCK_INFO_FIELD,
 		BAD_COLLATION,
 		CANNOT_COMPILE_CODE,
+		INCOMPATIBLE_TYPE_OF_JOIN,
 		NO_AVAILABLE_REPLICA,
 		UNEXPECTED_REPLICA,
 		MISMATCH_REPLICAS_DATA_SOURCES,
diff --git a/dbms/include/DB/DataStreams/RemoteBlockInputStream.h b/dbms/include/DB/DataStreams/RemoteBlockInputStream.h
index a55d931c4a6..aba6dedc75f 100644
--- a/dbms/include/DB/DataStreams/RemoteBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/RemoteBlockInputStream.h
@@ -179,7 +179,7 @@ protected:
 			if (use_many_replicas)
 				shard_replicas->sendQuery(query, "", stage, true);
 			else
-				connection->sendQuery(query, "", stage, send_settings ? &settings : nullptr, true);				
+				connection->sendQuery(query, "", stage, send_settings ? &settings : nullptr, true);
 
 			sendExternalTables();
 			sent_query = true;
diff --git a/dbms/src/Interpreters/InterpreterSelectQuery.cpp b/dbms/src/Interpreters/InterpreterSelectQuery.cpp
index 3d10b837881..536c01197ba 100644
--- a/dbms/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterSelectQuery.cpp
@@ -101,7 +101,7 @@ void InterpreterSelectQuery::basicInit(BlockInputStreamPtr input_, const NamesAn
 		}
 
 		if (!storage->supportsParallelReplicas() && (settings.parallel_replicas_count > 0))
-			throw Exception("Storage engine " + storage->getName() 
+			throw Exception("Storage engine " + storage->getName()
 							+ " does not support parallel execution on several replicas",
 							ErrorCodes::STORAGE_DOESNT_SUPPORT_PARALLEL_REPLICAS);