mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-10 09:32:06 +00:00
clean after cherry-pick
This commit is contained in:
parent
865606b83c
commit
e05f5388bc
@ -29,11 +29,6 @@
|
||||
#include <DataTypes/DataTypeLowCardinality.h>
|
||||
#include <Compression/CompressionFactory.h>
|
||||
#include <common/logger_useful.h>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
#include <iostream>
|
||||
>>>>>>> aa54091152... bugfix client logs + some tests
|
||||
|
||||
#include "TCPHandler.h"
|
||||
|
||||
|
@ -134,12 +134,8 @@ public:
|
||||
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,
|
||||
LogsLevel client_logs_level);
|
||||
>>>>>>> aa54091152... bugfix client logs + some tests
|
||||
|
||||
/// Sets query context for current thread and its thread group
|
||||
/// NOTE: query_context have to be alive until detachQuery() is called
|
||||
|
Loading…
Reference in New Issue
Block a user