From 4e8978e02222a2810a3e698f4203f2d12931c08e Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 17 Dec 2020 05:21:27 +0300
Subject: [PATCH] Merge with master

---
 src/Functions/trap.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Functions/trap.cpp b/src/Functions/trap.cpp
index 505e16411cc..7cd7d7c8c00 100644
--- a/src/Functions/trap.cpp
+++ b/src/Functions/trap.cpp
@@ -1,4 +1,4 @@
-#if 0
+#if 1
 
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
@@ -61,7 +61,8 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    [[clang::optnone]] ColumnPtr executeImpl(ColumnsWithTypeAndName & block, const DataTypePtr & result_type, size_t input_rows_count) const override
+    [[clang::optnone]]
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & block, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         if (const ColumnConst * column = checkAndGetColumnConst<ColumnString>(block[0].column.get()))
         {