Commit Graph

219 Commits

Author SHA1 Message Date
alesapin
3ffa9fa972 Resolve conflict 2019-09-04 15:44:12 +03:00
alexey-milovidov
b2e80b0cd9
Merge branch 'master' into query_masking 2019-09-03 22:58:15 +03:00
alesapin
e7ee9b7a67 Merge master 2019-09-02 11:46:00 +03:00
Alexey Milovidov
aac0b27daa Fixed possible deadlock in distributed queries 2019-08-31 15:18:14 +03:00
alesapin
1813b96f82 Finally build, possible trash. 2019-08-29 19:17:47 +03:00
alesapin
a85cdc91a6 Merge branch 'master' into ObjatieGroba-feature_multiple_disks 2019-08-19 11:34:02 +03:00
alesapin
e7542810bb Merge with master 2019-08-19 11:20:48 +03:00
alexey-milovidov
29cc99ad58
Merge pull request #6194 from yurriy/mysql
Compatibility with more MySQL clients.
2019-08-18 16:28:13 +03:00
Yuriy
c5b6d1f9bf merged origin/master 2019-08-15 19:48:10 +03:00
alesapin
e391ce813d refactoring 2019-08-14 18:20:52 +03:00
alesapin
949890ee90 Merged 2019-08-14 12:46:30 +03:00
Nikita Mikhaylov
bbe20b3f9f done 2019-08-13 17:31:46 +03:00
alesapin
75c3ed967a Checking updatable for user settings 2019-08-07 19:13:28 +03:00
Alexey Milovidov
8c05766888 Attempt to simplify text log 2019-08-04 18:51:04 +03:00
alexey-milovidov
a0599214ef
Merge pull request #6103 from nikitamikhaylov/system_text_log
Allow to write ClickHouse text logs into system table.
2019-08-04 17:51:34 +03:00
Alexey Milovidov
8b8c59d71b Simplification of #3796 2019-08-04 03:29:32 +03:00
Alexey Milovidov
224bc4df97 Minor modifications + a comment #3796 2019-08-04 03:12:17 +03:00
Nikita Mikhaylov
ad4459c4a2 fixed flush_logs + added pretty function 2019-07-31 17:03:23 +03:00
Igr Mineev
31c36efa25 Merge branch 'master' of github.com:yandex/ClickHouse into feature_multiple_disks 2019-07-30 19:13:58 +03:00
Nikita Mikhaylov
e06b3b17b3 some changes to log all text logs 2019-07-30 17:04:18 +03:00
Amos Bird
6db1c02bfd Fix materialized view with column defaults.
https://github.com/yandex/ClickHouse/issues/448
https://github.com/yandex/ClickHouse/issues/3484
https://github.com/yandex/ClickHouse/issues/3450
https://github.com/yandex/ClickHouse/issues/2878
https://github.com/yandex/ClickHouse/issues/2285
2019-07-30 10:49:54 +08:00
Yuriy
21ce5331d1 implemented mysql_native_password auth plugin for compatibility with mysqljs 2019-07-28 16:12:26 +03:00
Yuriy
383fa25c51 resolved conflict 2019-07-28 02:00:15 +03:00
Nikita Mikhaylov
811e3ab241 style check 2019-07-23 17:50:38 +03:00
Igr
3e017ec69c
Merge branch 'master' into feature_multiple_disks 2019-07-23 16:38:20 +03:00
Igr Mineev
e967c23adb Add Space interface for reservation. Add move to volume command 2019-07-23 16:34:17 +03:00
Nikita Mikhaylov
14b384f3e5
Merge branch 'master' into system_text_log 2019-07-23 15:51:04 +03:00
alexey-milovidov
e4ad0da6e3
Merge pull request #4247 from laplab/query-poor-mans-profiler
Poor man's profiler on query level [Work in progress]
2019-07-23 03:02:58 +03:00
Nikita Mikhaylov
c6667ff888 wip 2019-07-22 16:54:08 +03:00
Yuriy
fa2dfcd71d better 2019-07-19 21:43:52 +03:00
Mikhail Filimonov
9c2ae4513d SensitiveDataMasker 2019-07-19 10:22:42 +02:00
Igr Mineev
21e0bec3d0 Merge remote-tracking branch 'upstream/master' into feature_multiple_disks 2019-07-16 13:45:07 +03:00
Yuriy
1d6e31be4d merged master 2019-07-16 10:33:25 +03:00
Yuriy
c370de432a better 2019-07-16 10:28:53 +03:00
Yuriy
4df72f18ce writing packets in parts 2019-07-16 09:39:18 +03:00
Nikolai Kochetov
e9f3d4d6b8
Merge pull request #4914 from yandex/processors
Processors
2019-07-11 19:22:02 +03:00
Nikita Lapkov
9d540abc84 refactor 2019-07-10 20:47:39 +00:00
Nikolai Kochetov
209793c981 Merged with master. 2019-07-08 16:00:54 +03:00
Alexey Milovidov
f40b70884f Two more fixes for PVS-Studio 2019-07-08 05:14:32 +03:00
Alexey Milovidov
553e6a273e Two more fixes for PVS-Studio 2019-07-08 03:51:43 +03:00
Nikita Lapkov
ef1d84b35a do not run trace collector without trace_log. do not run query profilers without trace collector. 2019-07-06 20:29:00 +00:00
Nikita Lapkov
aaea6cbfc9 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-07-05 21:37:31 +00:00
Nikita Lapkov
0f579860f7 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-07-04 22:13:51 +00:00
Nikolai Kochetov
72afe9b842 Fix heap-use-after-free in ClusterCopier caused by watch which try to use already removed copier object. 2019-07-04 17:48:40 +03:00
Alexey Milovidov
a643f2f75e Merge branch 'master' into sanych73-prepared_statements 2019-06-29 15:51:56 +03:00
Nikita Lapkov
7cff36fbfc Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-06-26 11:46:04 +00:00
Nikolai Kochetov
f9b29bfdd2 Merged with master. 2019-06-25 20:00:54 +03:00
proller
1ac09fa721
Split Common/config.h by libs (dbms) (#5715) 2019-06-24 14:17:15 +03:00
Alexey Milovidov
7514674447 Merge remote-tracking branch 'origin/master' into sanych73-prepared_statements 2019-06-16 02:40:17 +03:00
Alexey Milovidov
fad6013270 Fixing query parameters 2019-06-15 20:52:53 +03:00