Commit Graph

284 Commits

Author SHA1 Message Date
Mikhail
8b714579ed Revert "Revert "Merge branch 'master' into kuryatnikovm-DOCSUP-8022-prefer_column_name_to_alias""
This reverts commit 7005feddf2.
2021-04-26 02:36:27 +03:00
Mikhail
7005feddf2 Revert "Merge branch 'master' into kuryatnikovm-DOCSUP-8022-prefer_column_name_to_alias"
This reverts commit 74190165ff, reversing
changes made to 51d4e4d307.
2021-04-26 02:03:32 +03:00
Denis Glazachev
b349e84fc7 Use nanodbc always together with odbc
Disable clickhouse-odbc-bridge building when odbc is disabled
2021-04-20 15:07:05 +04:00
changvvb
4eee2d0977 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into support-apple-m1 2021-04-15 22:54:26 +08:00
kssenii
7a287e6fe9 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into nanodbc 2021-04-11 21:36:08 +00:00
changvvb
03a2ba315b Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into support-apple-m1 2021-04-10 21:31:38 +08:00
alexey-milovidov
2d4a8c4787
Merge pull request #22885 from traceon/gcc-macos-compilation-fixes
Fix vanilla GCC compilation in macOS
2021-04-10 14:17:11 +03:00
changvvb
facbb0368b Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into support-apple-m1 2021-04-09 23:19:19 +08:00
kssenii
72d89bc933 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into nanodbc 2021-04-09 11:13:01 +00:00
Denis Glazachev
e8464d61f1 Fix vanilla GCC compilation in macOS 2021-04-09 04:28:24 +04:00
Denis Glazachev
4b116c214c Disable jemalloc for ALL macOS non-RelWithDebInfo builds
Revisit default ENABLE_* flag setting
2021-04-08 19:05:04 +04:00
alesapin
c28a3b860c Fix Coordination darwin build 2021-04-08 17:17:57 +03:00
changvvb
b070090ca7 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into support-apple-m1 2021-04-08 18:11:16 +08:00
kssenii
0b39480d51 Better 2021-04-06 20:01:23 +00:00
Alexander Kuzmenkov
29cf5bd712 Merge remote-tracking branch 'origin/master' into HEAD 2021-04-06 14:31:19 +03:00
changvvb
fdcf077cf5 Disabled rocksdb jemalloc 2021-04-06 17:06:18 +08:00
changvvb
1f8bd034a3 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into support-apple-m1 2021-04-06 15:55:03 +08:00
kssenii
38f135ab39 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into nanodbc 2021-04-05 15:37:53 +00:00
mastertheknife
4a79c52978 Fix tab\space in xz.cmake 2021-04-04 01:16:00 +03:00
mastertheknife
65ca073f42 Allow unbundled xz (lzma) using USE_INTERNAL_XZ_LIBRARY=OFF 2021-04-04 01:05:07 +03:00
kssenii
90db0be8e9 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into nanodbc 2021-04-03 08:01:13 +00:00
alexey-milovidov
18cb1bad25
Merge pull request #22475 from mastertheknife/ppc64le_disable_incompatible_libraries
ppc64le: Disable incompatible libraries (platform specific typically)
2021-04-02 21:29:11 +03:00
Alexander Kuzmenkov
2c91fc55e9 Merge remote-tracking branch 'origin/master' into HEAD 2021-04-02 18:38:05 +03:00
mastertheknife
2952cb296d Disable base64, fastops and libcpuid on unsupported platforms better 2021-04-02 13:57:46 +03:00
alexey-milovidov
e1d334b8e2
Merge pull request #22487 from mastertheknife/ppc64le_enable_bundled_openldap
ppc64le: Enable the bundled openldap
2021-04-02 10:07:14 +03:00
mastertheknife
b4003a07d2 ppc64le: Enable the bundled openldap 2021-04-02 06:32:09 +03:00
mastertheknife
6be8746d8c aarch64: Enable s3 2021-04-02 05:48:23 +03:00
mastertheknife
0692459f9f ppc64le: Disable incompatible libraries (platform specific typically) 2021-04-02 00:06:21 +03:00
Kseniia Sumarokova
e3fac9ef32
Merge branch 'master' into nanodbc 2021-04-01 16:38:00 +03:00
Alexander Kuzmenkov
faddd7e815 Merge remote-tracking branch 'origin/master' into HEAD 2021-04-01 14:26:36 +03:00
Alexander Kuzmenkov
a55d03cb62 try to avoid conflict with prlimit 2021-03-31 22:41:53 +03:00
alexey-milovidov
02021aaa3e
Update datasketches.cmake 2021-03-31 08:49:33 +03:00
kssenii
c81ab04e8f Switch to nanodbc 2021-03-22 12:37:05 +00:00
pingyu
83b7ab1fb5 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into datasketches-cmake 2021-03-20 21:15:07 +08:00
changvvb
bba600d558 Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into support-apple-m1 2021-03-16 13:26:00 +08:00
Denis Glazachev
290a6d273e
Add Kerberos support for authenticating existing users when accessing over HTTP 2021-03-11 23:41:10 +03:00
changvvb
fcb238715b Support apple m1 2021-03-12 01:12:52 +08:00
pingyu
08126030d6 wip #14893 2021-02-26 00:44:01 +08:00
Azat Khuzhin
58b0bbe6b1 Fix ccache 4.2+ usage (RULE_LAUNCH_COMPILE/RULE_LAUNCH_LINK was not set) 2021-02-24 21:56:19 +03:00
Azat Khuzhin
865dca0b0d ccache 4.2+ does not requires any quirks for SOURCE_DATE_EPOCH
And besides "ccache <some ccache options> compiler" does not work, since
it interpret everything as ccache options.

Refs: cad2416291
2021-02-18 22:39:44 +03:00
alesapin
63080a0b5e Redundant space 2021-02-10 12:31:01 +03:00
alesapin
57c9b6c864 Fix build without nuraft 2021-02-01 16:18:17 +03:00
Mikhail Filimonov
066fbfff0e
librdkafka support for arm64 2021-01-21 16:04:55 +01:00
Mikhail Filimonov
58c57bbb9d
Allow building librdkafka without ssl 2021-01-21 08:43:35 +01:00
Alexander Tokmakov
e2467427d1 Merge branch 'master' into update_cassandra 2021-01-19 14:10:15 +03:00
Alexey Milovidov
a19e7edd14 Merge branch 'master' into kssenii-pg2ch 2021-01-15 17:33:19 +03:00
Alexander Tokmakov
588d9f0a56 fix 2021-01-15 01:51:55 +03:00
Ilya Yatsishin
8004b0446f
Merge pull request #18924 from snar/enable-kafka-on-freebsd
Restore kafka on freebsd
2021-01-12 19:16:35 +03:00
alexey-milovidov
7e21d4d70a
Update ccache.cmake 2021-01-10 03:46:35 +03:00
Azat Khuzhin
0421ab6c80 Use time_macros over unset SOURCE_DATE_EPOCH in ccache 4.2 (unreleased)
ccache 4.2+ will ignore SOURCE_DATE_EPOCH [1].

  [1]: https://github.com/ccache/ccache/pull/755
2021-01-10 02:28:02 +03:00