From 200742d632b94097d839a99e00db1ab51fb5eeca Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Wed, 16 Sep 2015 07:18:52 +0300
Subject: [PATCH] Merge

---
 dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 706728fa393..eaf7e5f9128 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -582,7 +582,8 @@ BlockInputStreams MergeTreeDataSelectExecutor::spreadMarkRangesAmongThreadsFinal
 		switch (data.mode)
 		{
 			case MergeTreeData::Ordinary:
-				throw Exception("Ordinary MergeTree doesn't support FINAL", ErrorCodes::LOGICAL_ERROR);
+				merged = new MergingSortedBlockInputStream(to_merge, data.getSortDescription(), max_block_size);
+				break;
 
 			case MergeTreeData::Collapsing:
 				merged = new CollapsingFinalBlockInputStream(to_merge, data.getSortDescription(), data.sign_column);