thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-30 03:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean after cherry-pick

Browse Source
This commit is contained in:
NIKITA MIKHAILOV 2019-07-10 16:27:16 +03:00
parent 865606b83c
commit e05f5388bc
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbms/programs/server/TCPHandler.cpp
View File

@ -29,11 +29,6 @@
#include <DataTypes/DataTypeLowCardinality.h> #include <DataTypes/DataTypeLowCardinality.h>
#include <Compression/CompressionFactory.h> #include <Compression/CompressionFactory.h>
#include <common/logger_useful.h> #include <common/logger_useful.h>
<<<<<<< HEAD
=======
#include <iostream>
>>>>>>> aa54091152... bugfix client logs + some tests
#include "TCPHandler.h" #include "TCPHandler.h"

4
dbms/src/Common/ThreadStatus.h
View File

@ -134,12 +134,8 @@ public:
return thread_state == Died ? nullptr : logs_queue_ptr.lock(); return thread_state == Died ? nullptr : logs_queue_ptr.lock();
} }
<<<<<<< HEAD
void attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue, LogsLevel client_logs_level);
=======
void attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue, void attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue,
LogsLevel client_logs_level); LogsLevel client_logs_level);
>>>>>>> aa54091152... bugfix client logs + some tests
/// Sets query context for current thread and its thread group /// Sets query context for current thread and its thread group
/// NOTE: query_context have to be alive until detachQuery() is called /// NOTE: query_context have to be alive until detachQuery() is called