From 1bd4febfd5f36da1fbcc4053f149d4bff606fe4e Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 5 Apr 2021 05:17:17 +0300
Subject: [PATCH 1/3] Better retries on ZK errors in sh tests

---
 tests/clickhouse-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index a44f7972397..4cd19b6642d 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -406,7 +406,7 @@ def run_tests_array(all_tests_with_params):
                             status += stderr
                     else:
                         counter = 1
-                        while proc.returncode != 0 and need_retry(stderr):
+                        while need_retry(stderr):
                             proc, stdout, stderr, total_time = run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file, suite_tmp_dir)
                             sleep(2**counter)
                             counter += 1

From 74eb0828b8ace9ea30d4c2a16ca949d03ea4c3c2 Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Mon, 5 Apr 2021 10:34:34 -0300
Subject: [PATCH 2/3] fix incorrect settitng name

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43531b60267..8590fefa66d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,7 @@
 #### Experimental feature
 
 * Add experimental `Replicated` database engine. It replicates DDL queries across multiple hosts. [#16193](https://github.com/ClickHouse/ClickHouse/pull/16193) ([tavplubix](https://github.com/tavplubix)).
-* Introduce experimental support for window functions, enabled with `allow_experimental_functions = 1`. This is a preliminary, alpha-quality implementation that is not suitable for production use and will change in backward-incompatible ways in future releases. Please see [the documentation](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/sql-reference/window-functions/index.md#experimental-window-functions) for the list of supported features. [#20337](https://github.com/ClickHouse/ClickHouse/pull/20337) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Introduce experimental support for window functions, enabled with `allow_experimental_window_functions = 1`. This is a preliminary, alpha-quality implementation that is not suitable for production use and will change in backward-incompatible ways in future releases. Please see [the documentation](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/sql-reference/window-functions/index.md#experimental-window-functions) for the list of supported features. [#20337](https://github.com/ClickHouse/ClickHouse/pull/20337) ([Alexander Kuzmenkov](https://github.com/akuzm)).
 * Add the ability to backup/restore metadata files for DiskS3. [#18377](https://github.com/ClickHouse/ClickHouse/pull/18377) ([Pavel Kovalenko](https://github.com/Jokser)).
 
 #### Performance Improvement

From 0501c025dbcc9acb2e41eac483c2157b59c7a3eb Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 5 Apr 2021 18:09:14 +0300
Subject: [PATCH 3/3] Remove OpenCL

---
 docker/packager/binary/build.sh    | 1 -
 docker/packager/deb/build.sh       | 1 -
 docker/packager/unbundled/build.sh | 1 -
 3 files changed, 3 deletions(-)

diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh
index a42789c6186..d5830bf620b 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@@ -15,7 +15,6 @@ mkdir -p build/build_docker
 cd build/build_docker
 ccache --show-stats ||:
 ccache --zero-stats ||:
-ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so ||:
 rm -f CMakeCache.txt
 # Read cmake arguments into array (possibly empty)
 read -ra CMAKE_FLAGS <<< "${CMAKE_FLAGS:-}"
diff --git a/docker/packager/deb/build.sh b/docker/packager/deb/build.sh
index 6450e21d289..9ae80cb56b0 100755
--- a/docker/packager/deb/build.sh
+++ b/docker/packager/deb/build.sh
@@ -23,4 +23,3 @@ then
   fi
 fi
 ccache --show-stats ||:
-ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so ||:
diff --git a/docker/packager/unbundled/build.sh b/docker/packager/unbundled/build.sh
index 54575ab977c..99fc34fd9f3 100755
--- a/docker/packager/unbundled/build.sh
+++ b/docker/packager/unbundled/build.sh
@@ -13,4 +13,3 @@ mv /*.rpm /output ||: # if exists
 mv /*.tgz /output ||: # if exists
 
 ccache --show-stats ||:
-ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so ||: