thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-25 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync with arcadia

Browse Source
This commit is contained in:
proller 2018-10-01 18:43:48 +03:00
parent a4736275c6
commit ca03cd6606
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/programs/client/Client.cpp
View File

@ -61,7 +61,7 @@
#include <AggregateFunctions/registerAggregateFunctions.h>
#if USE_READLINE
#include "Suggest.h"
#include "Suggest.h" // Y_IGNORE
#endif
#ifndef __clang__

4
dbms/src/Storages/Kafka/StorageKafka.cpp
View File

@ -24,7 +24,7 @@
#include <Parsers/ASTLiteral.h>
#include <Parsers/ASTCreateQuery.h>
#include <Storages/Kafka/KafkaSettings.h>
#include <Storages/Kafka/StorageKafka.h> // Y_IGNORE
#include <Storages/Kafka/StorageKafka.h>
#include <Storages/StorageFactory.h>
#include <IO/ReadBuffer.h>
#include <common/logger_useful.h>
@ -32,7 +32,7 @@
#if __has_include(<rdkafka.h>) // maybe bundled
#include <rdkafka.h> // Y_IGNORE
#else // system
#include <librdkafka/rdkafka.h> // Y_IGNORE
#include <librdkafka/rdkafka.h>
#endif

2
libs/libmysqlxx/src/Connection.cpp
View File

@ -1,5 +1,5 @@
#if __has_include(<mariadb/mysql.h>)
#include <mariadb/mysql.h>
#include <mariadb/mysql.h> // Y_IGNORE
#else
#include <mysql/mysql.h>
#endif

2
libs/libmysqlxx/src/Exception.cpp
View File

@ -1,5 +1,5 @@
#if __has_include(<mariadb/mysql.h>)
#include <mariadb/mysql.h>
#include <mariadb/mysql.h> // Y_IGNORE
#else
#include <mysql/mysql.h>
#endif

4
libs/libmysqlxx/src/Pool.cpp
View File

@ -1,6 +1,6 @@
#if __has_include(<mariadb/mysql.h>)
#include <mariadb/mysql.h>
#include <mariadb/mysqld_error.h>
#include <mariadb/mysql.h> // Y_IGNORE
#include <mariadb/mysqld_error.h> // Y_IGNORE
#else
#include <mysql/mysql.h>
#include <mysql/mysqld_error.h>

2
libs/libmysqlxx/src/Query.cpp
View File

@ -1,5 +1,5 @@
#if __has_include(<mariadb/mysql.h>)
#include <mariadb/mysql.h>
#include <mariadb/mysql.h> // Y_IGNORE
#else
#include <mysql/mysql.h>
#endif

2
libs/libmysqlxx/src/ResultBase.cpp
View File

@ -1,5 +1,5 @@
#if __has_include(<mariadb/mysql.h>)
#include <mariadb/mysql.h>
#include <mariadb/mysql.h> // Y_IGNORE
#else
#include <mysql/mysql.h>
#endif

2
libs/libmysqlxx/src/Row.cpp
View File

@ -1,5 +1,5 @@
#if __has_include(<mariadb/mysql.h>)
#include <mariadb/mysql.h>
#include <mariadb/mysql.h> // Y_IGNORE
#else
#include <mysql/mysql.h>
#endif

2
libs/libmysqlxx/src/StoreQueryResult.cpp
View File

@ -1,5 +1,5 @@
#if __has_include(<mariadb/mysql.h>)
#include <mariadb/mysql.h>
#include <mariadb/mysql.h> // Y_IGNORE
#else
#include <mysql/mysql.h>
#endif

2
libs/libmysqlxx/src/UseQueryResult.cpp
View File

@ -1,5 +1,5 @@
#if __has_include(<mariadb/mysql.h>)
#include <mariadb/mysql.h>
#include <mariadb/mysql.h> // Y_IGNORE
#else
#include <mysql/mysql.h>
#endif