ClickHouse/dbms/include/DB/Core
Alexey Milovidov e97ecb6cf7 Merge branch 'master' into METR-19266
Conflicts:
	dbms/CMakeLists.txt
	dbms/include/DB/Functions/FunctionsArray.h
	dbms/include/DB/Functions/FunctionsString.h
	dbms/include/DB/Parsers/ExpressionListParsers.h
	dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
	dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
	dbms/src/Core/ErrorCodes.cpp
	dbms/src/Parsers/ASTFunction.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
	dbms/src/Storages/MergeTree/MergeTreeReader.cpp
	dbms/src/Storages/StorageLog.cpp
2016-12-10 07:51:36 +03:00
..
Block.h Merge branch 'master' into METR-19266 [#METR-19266] 2016-08-10 22:13:15 +03:00
BlockInfo.h Squashed commit of the following: 2016-02-16 19:39:39 +03:00
ColumnNumbers.h Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 13:35:44 +03:00
ColumnsWithTypeAndName.h Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 13:35:44 +03:00
ColumnWithTypeAndName.h Squashed commit of the following: 2016-02-16 19:39:39 +03:00
Defines.h Increased default background_pool_size [#METR-23632]. 2016-11-28 02:50:46 +03:00
Field.h dbms: Added support for nullable parameters (conditions and/or branches) in the function multiIf [#METR-19266] 2016-08-04 18:06:27 +03:00
FieldVisitors.h Fixed case when pk column is wrapped by functions. 2016-11-23 22:58:33 +03:00
Names.h Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 13:35:44 +03:00
NamesAndTypes.h Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 11:11:52 +03:00
Progress.h Translation of comments [#METR-22400]. 2016-08-17 09:41:43 +03:00
Protocol.h
QueryProcessingStage.h
Row.h Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 13:35:44 +03:00
SortDescription.h Vertical merging algorithm for MergeTree engines. [#METR-23305] 2016-11-29 22:41:31 +03:00
StringRef.h Make it compilable on OS X 2016-11-01 17:59:21 +01:00
toField.h dbms: separated mysqlxx::Date and mysqlxx::DateTime [#METR-17973]. 2016-02-03 04:17:58 +03:00
Types.h dbms: temporarily rolled back change that removes isNumeric()/behavesAsNumber() because it introduces bugs [#METR-19266] 2016-08-17 01:32:42 +03:00