9219 Commits

Author	SHA1	Message	Date
alesapin	2583abfccf	CLICKHOUSE-3878: Conflict fixes	2018-08-16 01:02:36 +03:00
alesapin	62c166db79	CLICKHOUSE-3878: Build fixes	2018-08-16 01:00:45 +03:00
alesapin	6fa4af882f	CLICKHOUSE-3878: Build fixes	2018-08-16 01:00:28 +03:00
Alexey Milovidov	9a78ee3e44	Removed static std::string variable #2482	2018-08-16 00:57:40 +03:00
chertus	0415c9e34a	fix int128 to float comparison [CLICKHOUSE-3765]	2018-08-15 19:43:40 +03:00
chertus	c8e945d73d	one another build fix	2018-08-15 18:29:57 +03:00
chertus	3805794e66	some more build fixes	2018-08-15 16:27:22 +03:00
alexey-milovidov	4524dcaf9a	Merge pull request #2871 from zhang2014/fix/build_failure ... ISSUES-2846 fix build failure with gcc 8.1	2018-08-15 13:35:23 +03:00
zhang2014	1549baa4e9	ISSUES-863 fix test failure #2015 #2840	2018-08-15 13:43:44 +08:00
zhang2014	3b0f0ac01e	ISSUES-2846 fix build failure with gcc 8.1	2018-08-15 11:51:03 +08:00
Alexey Milovidov	5410f73ba7	Fixed warnings #2015	2018-08-15 00:49:51 +03:00
Alexey Milovidov	03af27a218	Fixed warnings #2015	2018-08-15 00:48:39 +03:00
alexey-milovidov	ce9c6a5ab3	Merge branch 'master' into feature/ISSUES-863	2018-08-15 00:34:23 +03:00
alexey-milovidov	8586e6bb2e	Merge pull request #2787 from zhang2014/fix/replace_asterisk ... ISSUES-2786 fix replace asterisk with join query	2018-08-15 00:28:35 +03:00
chertus	7ca6a0737d	some more build fixes	2018-08-15 00:12:23 +03:00
alexey-milovidov	e7b671ec98	Merge branch 'master' into feature/ISSUES-863	2018-08-15 00:10:21 +03:00
alexey-milovidov	c376b2d476	Merge pull request #2869 from yandex/low-cardinality-fixes ... LowCardinality fixes	2018-08-14 22:36:19 +03:00
alexey-milovidov	beabb91903	Update IFunction.cpp	2018-08-14 22:35:52 +03:00
Alexey Milovidov	979154122f	Changed strange name #2846	2018-08-14 22:34:25 +03:00
chertus	44c3166c6e	Merge branch 'master' of github.com:yandex/ClickHouse	2018-08-14 22:17:28 +03:00
chertus	21fe103831	fix clang build	2018-08-14 22:16:56 +03:00
Nikolai Kochetov	26f464a4f9	Fix Const(LowCardinality) conversion. [#CLICKHOUSE-3621]	2018-08-14 20:19:48 +03:00
Nikolai Kochetov	f61fdf2076	Better const resolution for LowCardinality type. [#CLICKHOUSE-3621]	2018-08-14 20:19:40 +03:00
alexey-milovidov	c5b90717c2	Merge pull request #2828 from alesapin/master ... CLICKHOUSE-3878: ODBC-Bridge tool implementation	2018-08-14 17:25:43 +03:00
chertus	15cdd7b2bd	make clang happy	2018-08-14 17:19:58 +03:00
alesapin	942d9a5fee	Merge branch 'master' into master	2018-08-14 17:09:27 +03:00
chertus	8c54b480bc	minor fix	2018-08-14 16:26:23 +03:00
chertus	74823c8c17	add allow_experimental_decimal to settings	2018-08-14 15:51:45 +03:00
chertus	241b05c80a	merge master	2018-08-14 15:50:28 +03:00
alesapin	edc2dc45b6	Merge branch 'master' into master	2018-08-14 13:35:32 +03:00
alesapin	af19d4133d	CLICKHOUSE-3878: Move connection string validation to common, remove redundant headers, fix compilation issues	2018-08-14 13:33:41 +03:00
alexey-milovidov	6b3375393d	Merge pull request #2840 from VadimPE/CLICKHOUSE-3211 ... CLICKHOUSE-3211 add TOP m, and OFFSET k	2018-08-14 12:55:12 +03:00
alexey-milovidov	f42bd36fa0	Merge pull request #2856 from zhang2014/feature/add_check_access_database_for_system_tables ... Add check access database for system tables	2018-08-14 12:53:43 +03:00
zhang2014	e51264c3a5	Add check access database for system tables	2018-08-14 11:28:32 +08:00
alexey-milovidov	3e9f25b1b4	Merge pull request #2830 from yandex/data-type-with-dictionary ... LowCardinality data type.	2018-08-13 23:49:21 +03:00
alesapin	83d5dba53b	CLICKHOUSE-3878: Move ODBCDictionary to odbc-bridge	2018-08-13 21:10:26 +03:00
Nikolai Kochetov	4f31d136cb	Fix build.	2018-08-13 20:52:57 +03:00
Nikolai Kochetov	5d5344f106	Added allow_experimental_low_cardinality_type setting.	2018-08-13 20:02:54 +03:00
alexey-milovidov	c19213c6e7	Merge pull request #2845 from yandex/fix-arrayDistinct ... fix arrayDistinct	2018-08-13 19:46:53 +03:00
Vadim	8510bc3bbd	del white space	2018-08-13 18:31:45 +03:00
Vadim	e51e0f5eb9	Update ErrorCodes.cpp	2018-08-13 15:22:58 +03:00
Vadim	b9b6818325	Merge branch 'master' into CLICKHOUSE-3211	2018-08-13 13:48:44 +03:00
Vadim	61a26f7846	Update ErrorCodes.cpp	2018-08-13 13:46:06 +03:00
VadimPE	bb9d99b00c	CLICKHOUSE-3211 add Exception	2018-08-13 13:45:27 +03:00
alesapin	6fe3f0b13c	Merge remote-tracking branch 'upstream/master'	2018-08-13 12:36:27 +03:00
zhang2014	59b25812e7	Add check access database for system tables	2018-08-13 17:35:40 +08:00
alexey-milovidov	f538bd2113	Merge branch 'master' into decimal	2018-08-13 11:57:42 +03:00
sundy-li	65670bc33a	return nan when quantileExact with empty float column	2018-08-13 16:33:51 +08:00
alexey-milovidov	6114dfbad2	Merge pull request #2851 from zhang2014/feature/add_dependies_for_system_tables ... ISSUES-2850 add dependencies for system tables	2018-08-13 07:57:26 +03:00
Alexey Milovidov	7e50c88538	Added test case [#CLICKHOUSE-3891]	2018-08-13 07:35:12 +03:00