From 1c367fc666d5df4b56bff3ad8bedcd9c7e705f94 Mon Sep 17 00:00:00 2001
From: Vitaliy Lyudvichenko <vludv@yandex-team.ru>
Date: Thu, 1 Jun 2017 12:22:22 +0300
Subject: [PATCH] Fix DDLLogEntry::CURRENT_VERSION variable issue.
 [#CLICKHOUSE-5]

---
 dbms/src/Interpreters/DDLWorker.cpp | 5 +++--
 dbms/src/Server/config.xml          | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dbms/src/Interpreters/DDLWorker.cpp b/dbms/src/Interpreters/DDLWorker.cpp
index ff44d19d13..268c9b8664 100644
--- a/dbms/src/Interpreters/DDLWorker.cpp
+++ b/dbms/src/Interpreters/DDLWorker.cpp
@@ -60,7 +60,7 @@ struct DDLLogEntry
     Strings hosts;
     String initiator; // optional
 
-    static constexpr int CURRENT_VERSION = '1';
+    static constexpr int CURRENT_VERSION = 1;
 
     String toString()
     {
@@ -68,7 +68,8 @@ struct DDLLogEntry
         {
             WriteBufferFromString wb(res);
 
-            wb << "version: " << CURRENT_VERSION << "\n";
+            auto version = CURRENT_VERSION;
+            wb << "version: " << version << "\n";
             wb << "query: " << escape << query << "\n";
             wb << "hosts: " << hosts << "\n";
             wb << "initiator: " << initiator << "\n";
diff --git a/dbms/src/Server/config.xml b/dbms/src/Server/config.xml
index 534ce4cb24..88d6613690 100644
--- a/dbms/src/Server/config.xml
+++ b/dbms/src/Server/config.xml
@@ -240,6 +240,13 @@
         <task_queue_path>/clickhouse/task_queue</task_queue_path>
     </resharding>
 
+    <!-- Allow to execute distributed DDL queries (CREATE, DROP, ALTER, RENAME) on cluster.
+         Works only if ZooKeeper is enabled. Comment it if such functionality isn't required. -->
+    <distributed_ddl>
+        <!-- Path in ZooKeeper to queue with DDL queries -->
+        <path>/clickhouse/task_queue/ddl</path>
+    </distributed_ddl>
+
     <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
     <!--
     <merge_tree>
-- 
GitLab