From 63cc34d3f6fdce984e498bc20b5bfda8669abea3 Mon Sep 17 00:00:00 2001
From: Vitaliy Lyudvichenko <vludv@yandex-team.ru>
Date: Thu, 3 May 2018 16:34:19 +0300
Subject: [PATCH 1/2] Fixed incorrect failed OP detection in ZooKeeper.
 [#CLICKHOUSE-2]

---
 .gitignore                              | 1 +
 dbms/src/Common/ZooKeeper/ZooKeeper.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ac01f15002f..f4e9bab7a7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ cmake-build-*
 # Python cache
 *.pyc
 __pycache__
+*.pytest_cache
 
 # ignore generated files
 *-metrika-yandex
diff --git a/dbms/src/Common/ZooKeeper/ZooKeeper.cpp b/dbms/src/Common/ZooKeeper/ZooKeeper.cpp
index 65ba0b9306b..c348a5fab01 100644
--- a/dbms/src/Common/ZooKeeper/ZooKeeper.cpp
+++ b/dbms/src/Common/ZooKeeper/ZooKeeper.cpp
@@ -775,7 +775,7 @@ size_t KeeperMultiException::getFailedOpIndex(int32_t code, const Responses & re
 
 KeeperMultiException::KeeperMultiException(int32_t code, const Requests & requests, const Responses & responses)
     : KeeperException("Transaction failed at op #" + std::to_string(getFailedOpIndex(code, responses)), code),
-    requests(requests), responses(responses)
+    requests(requests), responses(responses), failed_op_index(getFailedOpIndex(code, responses))
 {
 }
 

From e0addcdfecf38031ffa2371529430fda85be314b Mon Sep 17 00:00:00 2001
From: KochetovNicolai <KochetovNicolai@users.noreply.github.com>
Date: Thu, 3 May 2018 20:29:53 +0300
Subject: [PATCH 2/2] Update ColumnVector.cpp

Fixed memset bytes count.
---
 dbms/src/Columns/ColumnVector.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dbms/src/Columns/ColumnVector.cpp b/dbms/src/Columns/ColumnVector.cpp
index 3509c14c3aa..31f0a0a06dd 100644
--- a/dbms/src/Columns/ColumnVector.cpp
+++ b/dbms/src/Columns/ColumnVector.cpp
@@ -116,7 +116,7 @@ MutableColumnPtr ColumnVector<T>::cloneResized(size_t size) const
         memcpy(&new_col.data[0], &data[0], count * sizeof(data[0]));
 
         if (size > count)
-            memset(&new_col.data[count], static_cast<int>(value_type()), size - count);
+            memset(&new_col.data[count], static_cast<int>(value_type()), (size - count) * sizeof(value_type));
     }
 
     return std::move(res);