From 67b406dfb9b0b71ed82422545d077f9a0c7c9c50 Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Fri, 27 Oct 2017 15:14:03 +0300
Subject: [PATCH 1/3] Fix contrib/zstd build

---
 contrib/zstd-cmake/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/zstd-cmake/CMakeLists.txt b/contrib/zstd-cmake/CMakeLists.txt
index 92c1865760a..b20093f982f 100644
--- a/contrib/zstd-cmake/CMakeLists.txt
+++ b/contrib/zstd-cmake/CMakeLists.txt
@@ -61,6 +61,7 @@ SET(Sources
         ${LIBRARY_DIR}/compress/huf_compress.c
         ${LIBRARY_DIR}/compress/zstd_compress.c
         ${LIBRARY_DIR}/compress/zstdmt_compress.c
+        ${LIBRARY_DIR}/compress/zstd_ldm.c
         ${LIBRARY_DIR}/decompress/huf_decompress.c
         ${LIBRARY_DIR}/decompress/zstd_decompress.c
         ${LIBRARY_DIR}/deprecated/zbuff_common.c
@@ -83,6 +84,7 @@ SET(Headers
         ${LIBRARY_DIR}/common/zstd_internal.h
         ${LIBRARY_DIR}/compress/zstdmt_compress.h
         ${LIBRARY_DIR}/compress/zstd_opt.h
+        ${LIBRARY_DIR}/compress/zstd_ldm.h
         ${LIBRARY_DIR}/deprecated/zbuff.h
         ${LIBRARY_DIR}/dictBuilder/divsufsort.h
         ${LIBRARY_DIR}/dictBuilder/zdict.h

From e6fc02b542961412b369b25d75db466d2720fe33 Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Fri, 27 Oct 2017 15:56:33 +0300
Subject: [PATCH 2/3] Fix contrib/zstd build

---
 contrib/zstd-cmake/CMakeLists.txt | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/contrib/zstd-cmake/CMakeLists.txt b/contrib/zstd-cmake/CMakeLists.txt
index b20093f982f..a4fcc00b14b 100644
--- a/contrib/zstd-cmake/CMakeLists.txt
+++ b/contrib/zstd-cmake/CMakeLists.txt
@@ -60,8 +60,12 @@ SET(Sources
         ${LIBRARY_DIR}/compress/fse_compress.c
         ${LIBRARY_DIR}/compress/huf_compress.c
         ${LIBRARY_DIR}/compress/zstd_compress.c
-        ${LIBRARY_DIR}/compress/zstdmt_compress.c
+        ${LIBRARY_DIR}/compress/zstd_double_fast.c
+        ${LIBRARY_DIR}/compress/zstd_fast.c
+        ${LIBRARY_DIR}/compress/zstd_lazy.c
         ${LIBRARY_DIR}/compress/zstd_ldm.c
+        ${LIBRARY_DIR}/compress/zstdmt_compress.c
+        ${LIBRARY_DIR}/compress/zstd_opt.c
         ${LIBRARY_DIR}/decompress/huf_decompress.c
         ${LIBRARY_DIR}/decompress/zstd_decompress.c
         ${LIBRARY_DIR}/deprecated/zbuff_common.c
@@ -82,6 +86,11 @@ SET(Headers
         ${LIBRARY_DIR}/common/xxhash.h
         ${LIBRARY_DIR}/common/zstd_errors.h
         ${LIBRARY_DIR}/common/zstd_internal.h
+        ${LIBRARY_DIR}/compress/zstd_compress.h
+        ${LIBRARY_DIR}/compress/zstd_double_fast.h
+        ${LIBRARY_DIR}/compress/zstd_fast.h
+        ${LIBRARY_DIR}/compress/zstd_lazy.h
+        ${LIBRARY_DIR}/compress/zstd_ldm.h
         ${LIBRARY_DIR}/compress/zstdmt_compress.h
         ${LIBRARY_DIR}/compress/zstd_opt.h
         ${LIBRARY_DIR}/compress/zstd_ldm.h

From 2dd26349fb243b384d67338b0285498f56626bde Mon Sep 17 00:00:00 2001
From: Vitaliy Lyudvichenko <vludv@yandex-team.ru>
Date: Fri, 27 Oct 2017 16:05:56 +0300
Subject: [PATCH 3/3] Update docs. [#CLICKHOUSE-3]

---
 contrib/librdkafka                 | 2 +-
 contrib/poco                       | 2 +-
 contrib/zstd                       | 2 +-
 docs/en/query_language/queries.rst | 2 +-
 docs/ru/query_language/queries.rst | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/librdkafka b/contrib/librdkafka
index 3401fa1e456..c44f40be965 160000
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@@ -1 +1 @@
-Subproject commit 3401fa1e45605b5ae806f94905c92f5f546a607b
+Subproject commit c44f40be96556ab8145f0f5bcaa500d16d4e0fc4
diff --git a/contrib/poco b/contrib/poco
index ad1643c6698..1e437f87364 160000
--- a/contrib/poco
+++ b/contrib/poco
@@ -1 +1 @@
-Subproject commit ad1643c6698a8c890b68186d5c9d72e496c27af2
+Subproject commit 1e437f873645b81f8676141e17f02395fa69a0c0
diff --git a/contrib/zstd b/contrib/zstd
index f4340f46b23..aecf3b479c4 160000
--- a/contrib/zstd
+++ b/contrib/zstd
@@ -1 +1 @@
-Subproject commit f4340f46b2387bc8de7d5320c0b83bb1499933ad
+Subproject commit aecf3b479c45affa9fd8ead068e9160253a8ec5c
diff --git a/docs/en/query_language/queries.rst b/docs/en/query_language/queries.rst
index 25894a0c81c..49285dccc9c 100644
--- a/docs/en/query_language/queries.rst
+++ b/docs/en/query_language/queries.rst
@@ -133,7 +133,7 @@ This query is fully equivalent to using the subquery:
 
 Materialized views store data transformed by the corresponding SELECT query.
 
-When creating a materialized view, you can specify ENGINE - the table engine for storing data. By default, it uses the same engine as for the table that the SELECT query is made from.
+When creating a materialized view, you have to specify ENGINE - the table engine for storing data.
 
 A materialized view is arranged as follows: when inserting data to the table specified in SELECT, part of the inserted data is converted by this SELECT query, and the result is inserted in the view.
 
diff --git a/docs/ru/query_language/queries.rst b/docs/ru/query_language/queries.rst
index 52f5f740fb1..c80c1447f15 100644
--- a/docs/ru/query_language/queries.rst
+++ b/docs/ru/query_language/queries.rst
@@ -137,7 +137,7 @@ CREATE VIEW
 
 Материализованные (MATERIALIZED) представления хранят данные, преобразованные соответствующим запросом SELECT.
 
-При создании материализованного представления, можно указать ENGINE - движок таблицы для хранения данных. По умолчанию, будет использован тот же движок, что и у таблицы, из которой делается запрос SELECT.
+При создании материализованного представления, нужно обязательно указать ENGINE - движок таблицы для хранения данных.
 
 Материализованное представление устроено следующим образом: при вставке данных в таблицу, указанную в SELECT-е, кусок вставляемых данных преобразуется этим запросом SELECT, и полученный результат вставляется в представление.