Commit Graph

17575 Commits

Author SHA1 Message Date
Alexey Milovidov
c81eaf66da Corrected comment #2482 2018-08-19 07:31:51 +03:00
Alexey Milovidov
1802b00c0b Fixed bad arithmetic; miscellaneous #2482 2018-08-19 07:25:53 +03:00
Alexey Milovidov
1373b2e78d Suppress warning in 3rd-party library #2807 2018-08-19 06:42:43 +03:00
alexey-milovidov
89655b5f2d
Merge pull request #2482 from yandex/CLICKHOUSE-2910
Performance introspection
2018-08-19 06:37:55 +03:00
Alexey Milovidov
925ab91b66 Added clarifying comment [#CLICKHOUSE-2] 2018-08-19 06:36:35 +03:00
Alexey Milovidov
81dd290a42 Removed bad code #2864 2018-08-19 06:26:28 +03:00
Alexey Milovidov
ef5d08532a Removed bad code #2864 2018-08-19 06:25:38 +03:00
alexey-milovidov
cc93e7d7bd
Merge pull request #2891 from amosbird/patch-11
avoid cmake compatible behavior for better linking
2018-08-18 16:50:23 +03:00
Amos Bird
28288b7b72
avoid cmake compatible behavior for better linking
https://cmake.org/cmake/help/v3.9/policy/CMP0060.html#policy:CMP0060

Link fails when libraries like `ICU` reside in `/usr/local/` while cmake uses old flavor of linking, which adds `-l<SONAME>` directly without the actual library paths.
2018-08-18 15:59:52 +08:00
Alexey Milovidov
2dae8f9396 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-18 04:45:00 +03:00
Alexey Milovidov
1c4f5d3359 Miscellaneous #2482 2018-08-17 21:57:07 +03:00
alexey-milovidov
f978fafd85
Merge pull request #2889 from proller/fix3
Rare segfault fix
2018-08-17 21:33:08 +03:00
proller
62b6b6d73e Rare segfault fix 2018-08-17 21:23:10 +03:00
alexey-milovidov
bc082156e6
Merge pull request #2886 from amosbird/patch-10
Using correct config ref to initialize odbc bridge
2018-08-17 20:21:41 +03:00
Amos Bird
57970a8bef
Using correct config ref to initialize odbc bridge 2018-08-17 19:00:42 +08:00
Alexey Milovidov
aef490d173 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910
Conflicts:
	dbms/src/Common/ODBCBridgeHelper.h
2018-08-17 00:47:15 +03:00
alexey-milovidov
7c87aee6ee
Merge pull request #2882 from zamulla/patch-1
Typo fix
2018-08-17 00:42:13 +03:00
alexey-milovidov
5cf1ec159e
Merge pull request #2884 from proller/fix20
Apple build fix
2018-08-17 00:41:03 +03:00
proller
40c3b13f3b Apple build fix 2018-08-16 22:34:57 +03:00
Artem Zuikov
00f3c1c805
changelog draft for 18.10.3 2018-08-16 21:50:18 +03:00
zamulla
dbd4971273
Typo fix 2018-08-16 17:45:50 +03:00
chertus
23c0e8efb5 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-16 14:05:20 +03:00
chertus
70d2c4ecf6 minor changes [CLICKHOUSE-3765] 2018-08-16 14:05:14 +03:00
Alexey Milovidov
b088154b14 Merge branch 'CLICKHOUSE-2910' of github.com:yandex/ClickHouse into CLICKHOUSE-2910 2018-08-16 01:43:59 +03:00
Alexey Milovidov
e2eb0650b8 Auto version update to [18.11.0] [54406] 2018-08-16 01:43:16 +03:00
Alexey Milovidov
56af576fe5 Removed duplicate query_id logging #2482 2018-08-16 01:39:19 +03:00
alexey-milovidov
b5adb509e8
Merge pull request #2879 from alesapin/master
Fixes in ODBC Bridge build
2018-08-16 01:09:01 +03:00
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
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