Commit Graph

17671 Commits

Author SHA1 Message Date
Alexey Milovidov
76af46ed5d Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910
Conflicts:
	dbms/src/Interpreters/Settings.h
	dbms/tests/queries/0_stateless/00687_top_and_offset.sql
2018-08-16 00:44:24 +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
alexey-milovidov
e11631178d
Merge pull request #2873 from zhang2014/fix/ISSUES-863
ISSUES-863 fix test failure
2018-08-15 13:33:46 +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
ab2213442d Miscellaneous #2482 2018-08-15 01:01:41 +03:00
Alexey Milovidov
dfd9be86d8 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-15 00:50:00 +03:00
Alexey Milovidov
5410f73ba7 Fixed warnings #2015 2018-08-15 00:49:51 +03:00
Alexey Milovidov
31867c0612 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-15 00:48:51 +03:00
Alexey Milovidov
03af27a218 Fixed warnings #2015 2018-08-15 00:48:39 +03:00
Alexey Milovidov
9916a75f2e Merging #2482 2018-08-15 00:35:26 +03:00
alexey-milovidov
17bccda3f1
Merge pull request #2015 from zhang2014/feature/ISSUES-863
ISSUES-863 support predicate push down
2018-08-15 00:34:33 +03:00
alexey-milovidov
ce9c6a5ab3
Merge branch 'master' into feature/ISSUES-863 2018-08-15 00:34:23 +03:00
Alexey Milovidov
c80db48a6e Merging #2482 2018-08-15 00:32:49 +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
Alexey Milovidov
c72482528c Merging #2482 2018-08-15 00:18:14 +03:00
Alexey Milovidov
93c9eab088 Merging #2482 2018-08-15 00:15:17 +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
21579a3cc8 Removed static std::string variable #2482 2018-08-14 23:56:23 +03:00
Alexey Milovidov
acb99b49df Merge branch 'master' into CLICKHOUSE-2910 2018-08-14 23:29:42 +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
2953be89a4 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-14 21:00:41 +03:00
Nikolai Kochetov
fce3bc193b Updated test for JOIN ON syntax. [#CLICKHOUSE-3761] 2018-08-14 21:00:17 +03:00
Nikolai Kochetov
2f0f7eacbf Updated test. [#CLICKHOUSE-3621] 2018-08-14 20:19:55 +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
VadimPE
c8e2506b5f ISSUES-2581 add check when replica do not have part added with quorum 2018-08-14 19:40:51 +03:00
alexey-milovidov
e99738a7d1
Merge pull request #2835 from BayoNet/master
Settings for quorum INSERT
2018-08-14 17:53:58 +03:00
alexey-milovidov
337cf525b6
Update geo.md 2018-08-14 17:52:38 +03:00
alexey-milovidov
bbb7900266
Update settings.md 2018-08-14 17:42:17 +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
proller
a2343890dd Build fixes (#2864)
* Try fix internal compiler headers path

* Build fixes

* fix

* wip

* clean

* Update arch.cmake
2018-08-14 16:31:26 +03:00
alexey-milovidov
a29439cfee
Merge pull request #2846 from 4ertus2/decimal
Decimal
2018-08-14 16:29:28 +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
VadimPE
74aded610f Merge branch 'ISSUES-2581' of github.com:VadimPE/ClickHouse into ISSUES-2581 2018-08-14 13:25:15 +03:00
VadimPE
a37ad50329 ISSUES-2581 fix build 2018-08-14 13:24:39 +03:00