From ca03cd6606a81aeeed938a133bc1e03ffedfc34b Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Mon, 1 Oct 2018 18:43:48 +0300
Subject: [PATCH] Sync with arcadia

---
 dbms/programs/client/Client.cpp          | 2 +-
 dbms/src/Storages/Kafka/StorageKafka.cpp | 4 ++--
 libs/libmysqlxx/src/Connection.cpp       | 2 +-
 libs/libmysqlxx/src/Exception.cpp        | 2 +-
 libs/libmysqlxx/src/Pool.cpp             | 4 ++--
 libs/libmysqlxx/src/Query.cpp            | 2 +-
 libs/libmysqlxx/src/ResultBase.cpp       | 2 +-
 libs/libmysqlxx/src/Row.cpp              | 2 +-
 libs/libmysqlxx/src/StoreQueryResult.cpp | 2 +-
 libs/libmysqlxx/src/UseQueryResult.cpp   | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dbms/programs/client/Client.cpp b/dbms/programs/client/Client.cpp
index ad9c36a3a45..6ff8899cd93 100644
--- a/dbms/programs/client/Client.cpp
+++ b/dbms/programs/client/Client.cpp
@@ -61,7 +61,7 @@
 #include <AggregateFunctions/registerAggregateFunctions.h>
 
 #if USE_READLINE
-#include "Suggest.h"
+#include "Suggest.h" // Y_IGNORE
 #endif
 
 #ifndef __clang__
diff --git a/dbms/src/Storages/Kafka/StorageKafka.cpp b/dbms/src/Storages/Kafka/StorageKafka.cpp
index 10c77de58a3..5b014aa7511 100644
--- a/dbms/src/Storages/Kafka/StorageKafka.cpp
+++ b/dbms/src/Storages/Kafka/StorageKafka.cpp
@@ -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
 
 
diff --git a/libs/libmysqlxx/src/Connection.cpp b/libs/libmysqlxx/src/Connection.cpp
index 7e771c48bfb..c69c735dd72 100644
--- a/libs/libmysqlxx/src/Connection.cpp
+++ b/libs/libmysqlxx/src/Connection.cpp
@@ -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
diff --git a/libs/libmysqlxx/src/Exception.cpp b/libs/libmysqlxx/src/Exception.cpp
index dadd37e29e7..eb778e0c86f 100644
--- a/libs/libmysqlxx/src/Exception.cpp
+++ b/libs/libmysqlxx/src/Exception.cpp
@@ -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
diff --git a/libs/libmysqlxx/src/Pool.cpp b/libs/libmysqlxx/src/Pool.cpp
index 28eb4169a43..9e592b4aba0 100644
--- a/libs/libmysqlxx/src/Pool.cpp
+++ b/libs/libmysqlxx/src/Pool.cpp
@@ -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>
diff --git a/libs/libmysqlxx/src/Query.cpp b/libs/libmysqlxx/src/Query.cpp
index 0bcafa04421..57609e8365a 100644
--- a/libs/libmysqlxx/src/Query.cpp
+++ b/libs/libmysqlxx/src/Query.cpp
@@ -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
diff --git a/libs/libmysqlxx/src/ResultBase.cpp b/libs/libmysqlxx/src/ResultBase.cpp
index b03f92e38f2..b9fd3110acb 100644
--- a/libs/libmysqlxx/src/ResultBase.cpp
+++ b/libs/libmysqlxx/src/ResultBase.cpp
@@ -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
diff --git a/libs/libmysqlxx/src/Row.cpp b/libs/libmysqlxx/src/Row.cpp
index e4baa681d69..d7c6e67d0e7 100644
--- a/libs/libmysqlxx/src/Row.cpp
+++ b/libs/libmysqlxx/src/Row.cpp
@@ -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
diff --git a/libs/libmysqlxx/src/StoreQueryResult.cpp b/libs/libmysqlxx/src/StoreQueryResult.cpp
index 05ad4299e17..9b516cb05fb 100644
--- a/libs/libmysqlxx/src/StoreQueryResult.cpp
+++ b/libs/libmysqlxx/src/StoreQueryResult.cpp
@@ -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
diff --git a/libs/libmysqlxx/src/UseQueryResult.cpp b/libs/libmysqlxx/src/UseQueryResult.cpp
index c5c52ffcb9c..7d200583f9c 100644
--- a/libs/libmysqlxx/src/UseQueryResult.cpp
+++ b/libs/libmysqlxx/src/UseQueryResult.cpp
@@ -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