Commit Graph

820 Commits

Author SHA1 Message Date
alesapin
eb5e052855 merge and fixes 2019-08-21 13:09:29 +03:00
proller
4f1c9ee197 CLICKHOUSE-3885 copier: use partition_key in check query 2019-08-20 21:05:01 +03:00
alesapin
a85cdc91a6 Merge branch 'master' into ObjatieGroba-feature_multiple_disks 2019-08-19 11:34:02 +03:00
Георгий Кондратьев
c70d585169 DEVTOOLS-5755 Remove odbc-bridge.cpp from clickhouse-lib
odbc-bridge.cpp defines main() so it should not be included in clickhouse-lib.
2019-08-19 05:13:39 +00:00
alexey-milovidov
29cc99ad58
Merge pull request #6194 from yurriy/mysql
Compatibility with more MySQL clients.
2019-08-18 16:28:13 +03:00
alexey-milovidov
a70bfa13d4
Merge pull request #6467 from nikitamikhaylov/system_metric_log
system.metric_log table
2019-08-16 02:28:53 +03:00
Yuriy
c5b6d1f9bf merged origin/master 2019-08-15 19:48:10 +03:00
Nikita Mikhaylov
e83482b512 metric_log.xml 2019-08-14 20:21:45 +03:00
alesapin
bccf62100f Revert check 2019-08-14 18:25:57 +03:00
Nikita Mikhaylov
15bbf080f3 changes after review 2019-08-14 15:54:41 +03:00
akuzm
6bcfe51edf
In performance test, do not read query log for queries we didn't run. (#6427) 2019-08-14 14:04:11 +03:00
alesapin
949890ee90 Merged 2019-08-14 12:46:30 +03:00
Alexey Milovidov
5830526fa1 Slightly better information messages 2019-08-11 23:37:53 +03:00
alexey-milovidov
838c5e535f
Merge pull request #6433 from yandex/prevent-stack-overflow-in-parser
Fixed possible stack overflow in parser
2019-08-10 23:58:54 +03:00
Alexey Milovidov
0a9787c7f3 Fixed possible stack overflow in parser 2019-08-10 19:38:25 +03:00
kreuzerkrieg
112fc71276 adding -Wshadow for GCC 2019-08-09 23:58:16 +03:00
Alexey Milovidov
86f321a7cd Whitespaces 2019-08-09 02:55:08 +03:00
Alexey Milovidov
d256fb9d57 Removed extra verbose logging from MySQL handler 2019-08-07 22:14:58 +03:00
alexey-milovidov
a455bd7355
Merge pull request #6348 from Vxider/master
build fix
2019-08-06 17:24:22 +03:00
Vxider
42287c0b72 format code 2019-08-06 22:04:51 +08:00
Vxider
4d780d99f4 build fix 2019-08-06 22:03:41 +08:00
Vxider
03092d5704 build fix 2019-08-06 00:53:11 +08:00
Nikolai Kochetov
e361d336bb
Merge pull request #6239 from yandex/processors-and-output-formats
Processors and output formats
2019-08-05 19:45:17 +03:00
Vxider
d5fd3c0a8a build fix 2019-08-06 00:25:26 +08:00
Alexey Milovidov
a19d05d6df Fixed minor discrepancies 2019-08-05 19:05:37 +03:00
Nikolai Kochetov
b0b7ed791d Merge branch 'master' into processors-and-output-formats 2019-08-04 19:47:26 +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
Nikolai Kochetov
599f3ddf6e Merged with master. 2019-08-04 15:35:21 +03:00
Alexey Milovidov
d8eae1f83a Disable query profiler if we build with test coverage 2019-08-03 23:47:57 +03:00
Alexey Milovidov
06b99e61aa Fixed "unbundled" build 2019-08-03 23:47:57 +03:00
Nikolai Kochetov
c336c514fb Remove TSKVRowInputStream. 2019-08-02 19:58:52 +03:00
Alexander Rodin
68487d512a Merge if branches with the same status code 2019-08-02 05:11:02 +00:00
Alexander Rodin
5c5b4f4de2 Revert "Replace ifs by cases"
This reverts commit 0c70f78fcb.
2019-08-02 05:07:10 +00:00
Alexander Rodin
0c70f78fcb Replace ifs by cases 2019-08-01 15:23:20 +00:00
Alexander Rodin
44b3dbb23b Return Bad Request for INCORRECT_DATA and TYPE_MISMATCH errors 2019-08-01 13:16:09 +00:00
Nikita Mikhaylov
508934fa85 remove redudant includes 2019-08-01 16:05:59 +03:00
Igr Mineev
0f1e8404dc Merge branch 'master' of github.com:yandex/ClickHouse into feature_multiple_disks 2019-08-01 13:42:59 +03:00
Nikita Mikhaylov
a9fea0314e better style 2019-08-01 13:31:29 +03:00
Igr Mineev
fc79ed86ef Ready for review 2019-08-01 13:29:14 +03:00
Alexey Milovidov
f3921ce3e0 Changed boost::filesystem to std::filesystem 2019-08-01 01:37:41 +03:00
Nikita Mikhaylov
ad4459c4a2 fixed flush_logs + added pretty function 2019-07-31 17:03:23 +03:00
alexey-milovidov
c4072b12a7
Merge pull request #6230 from yandex/override-idle-time-poll-interval
Allow user to override poll_interval and idle_connection_timeout
2019-07-31 05:57:46 +03:00
Alexey Milovidov
b6275010f2 Fixed error with server shutdown 2019-07-31 02:12:04 +03:00
Alexey Milovidov
aa6f7f2730 Slightly better 2019-07-31 01:27:14 +03:00
Alexey Milovidov
0055bd1a1b Allow user to override poll_interval and idle_connection_timeout 2019-07-31 01:22:45 +03:00
Alexey Milovidov
2452b2eba7 Fixed the issue with "listen_try" option 2019-07-31 01:08:57 +03:00
Alexey Milovidov
3ef3dcb4c8 Fixed the issue with "listen_try" option 2019-07-31 01:06:13 +03:00
Alexey Milovidov
e0c8bec28a Fixed the issue with "listen_try" option 2019-07-31 00:23:42 +03:00
Alexey Milovidov
b85cdd565c Fixed idiotic inconsistent code 2019-07-31 00:11:42 +03:00