From 9f721f725e586aaebb3494390c94b950437df490 Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Tue, 4 Dec 2018 12:17:52 +0200 Subject: [PATCH] MXS-2205 Convert maxscale/protocol/mysql.h to .hh --- examples/roundrobinrouter.cpp | 2 +- include/maxscale/monitor.hh | 2 +- include/maxscale/mysql_utils.hh | 2 +- include/maxscale/protocol/mariadb_client.hh | 2 +- .../maxscale/protocol/{mysql.h => mysql.hh} | 26 +++++++++---------- .../qc_mysqlembedded/qc_mysqlembedded.cc | 2 +- query_classifier/qc_sqlite/qc_sqlite.cc | 2 +- query_classifier/test/compare.cc | 2 +- query_classifier/test/qc_cache.cc | 2 +- query_classifier/test/version_sensitivity.cc | 2 +- server/core/backend.cc | 2 +- server/core/modutil.cc | 2 +- server/core/mysql_binlog.cc | 2 +- server/core/queryclassifier.cc | 2 +- server/core/resultset.cc | 2 +- server/core/secrets.cc | 2 +- server/core/session.cc | 2 +- server/core/session_command.cc | 2 +- server/core/test/test_session_track.cc | 2 +- server/core/test/test_trxcompare.cc | 2 +- server/core/test/test_trxtracking.cc | 2 +- .../GSSAPI/GSSAPIAuth/gssapi_auth.cc | 2 +- .../GSSAPIBackendAuth/gssapi_backend_auth.cc | 2 +- .../authenticator/MySQLAuth/dbusers.cc | 2 +- .../authenticator/MySQLAuth/mysql_auth.cc | 2 +- .../authenticator/MySQLAuth/mysql_auth.hh | 2 +- .../MySQLBackendAuth/mysql_backend_auth.cc | 2 +- .../NullAuthAllow/null_auth_allow.cc | 2 +- .../authenticator/PAM/PAMAuth/pam_auth.hh | 2 +- .../PAM/PAMBackendAuth/pam_backend_auth.hh | 2 +- .../binlogfilter/binlogfiltersession.cc | 2 +- .../modules/filter/cache/cache_storage_api.hh | 2 +- server/modules/filter/cache/rules.cc | 2 +- server/modules/filter/cache/test/testrules.cc | 2 +- .../modules/filter/dbfwfilter/dbfwfilter.cc | 2 +- server/modules/filter/dbfwfilter/rules.cc | 2 +- server/modules/filter/dbfwfilter/user.cc | 2 +- .../filter/insertstream/insertstream.cc | 2 +- .../filter/masking/maskingfiltersession.cc | 2 +- server/modules/filter/masking/mysql.hh | 2 +- server/modules/filter/maxrows/maxrows.cc | 2 +- server/modules/filter/mqfilter/mqfilter.cc | 2 +- .../filter/test/maxscale/mock/session.hh | 3 ++- server/modules/filter/test/mock.cc | 2 +- server/modules/filter/test/mock_backend.cc | 2 +- server/modules/monitor/grmon/grmon.cc | 2 +- .../MySQL/mariadbbackend/mysql_backend.cc | 2 +- .../MySQL/mariadbclient/mysql_client.cc | 2 +- .../protocol/MySQL/mariadbclient/setparser.hh | 2 +- .../MySQL/mariadbclient/setsqlmodeparser.hh | 2 +- .../MySQL/mariadbclient/sqlmodeparser.hh | 2 +- server/modules/protocol/MySQL/mysql_common.cc | 2 +- server/modules/protocol/MySQL/rwbackend.cc | 2 +- server/modules/routing/avrorouter/avro.cc | 2 +- .../modules/routing/avrorouter/avro_main.cc | 2 +- .../modules/routing/avrorouter/avrorouter.hh | 2 +- server/modules/routing/avrorouter/rpl.cc | 2 +- server/modules/routing/binlogrouter/blr.cc | 2 +- server/modules/routing/binlogrouter/blr.hh | 2 +- .../routing/binlogrouter/blr_master.cc | 2 +- .../routing/binlogrouter/test/testbinlog.cc | 2 +- server/modules/routing/cat/catsession.cc | 2 +- server/modules/routing/maxinfo/maxinfo.cc | 2 +- .../routing/readconnroute/readconnroute.cc | 2 +- .../routing/readwritesplit/readwritesplit.hh | 2 +- .../routing/readwritesplit/rwsplit_mysql.cc | 2 +- .../schemarouter/schemaroutersession.hh | 2 +- 67 files changed, 79 insertions(+), 80 deletions(-) rename include/maxscale/protocol/{mysql.h => mysql.hh} (99%) diff --git a/examples/roundrobinrouter.cpp b/examples/roundrobinrouter.cpp index ee2e589e2..733601565 100644 --- a/examples/roundrobinrouter.cpp +++ b/examples/roundrobinrouter.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/maxscale/monitor.hh b/include/maxscale/monitor.hh index 48dc771a8..13dbb8b78 100644 --- a/include/maxscale/monitor.hh +++ b/include/maxscale/monitor.hh @@ -26,7 +26,7 @@ #include #include #include -#include +#include MXS_BEGIN_DECLS diff --git a/include/maxscale/mysql_utils.hh b/include/maxscale/mysql_utils.hh index e49790d89..569d8bc5b 100644 --- a/include/maxscale/mysql_utils.hh +++ b/include/maxscale/mysql_utils.hh @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include MXS_BEGIN_DECLS diff --git a/include/maxscale/protocol/mariadb_client.hh b/include/maxscale/protocol/mariadb_client.hh index 8987ec47a..93a731679 100644 --- a/include/maxscale/protocol/mariadb_client.hh +++ b/include/maxscale/protocol/mariadb_client.hh @@ -19,7 +19,7 @@ #include #include #include -#include +#include /** A DCB-like client abstraction which ignores responses */ class LocalClient : public MXB_POLL_DATA diff --git a/include/maxscale/protocol/mysql.h b/include/maxscale/protocol/mysql.hh similarity index 99% rename from include/maxscale/protocol/mysql.h rename to include/maxscale/protocol/mysql.hh index e81c2c8dd..9c6ad8040 100644 --- a/include/maxscale/protocol/mysql.h +++ b/include/maxscale/protocol/mysql.hh @@ -12,31 +12,29 @@ */ #pragma once -#include +#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include +#include #include #include #include #include #include - -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc index e8e73dfc3..656eeaa7b 100644 --- a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc +++ b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc @@ -63,7 +63,7 @@ #include #include #include -#include +#include #include #include diff --git a/query_classifier/qc_sqlite/qc_sqlite.cc b/query_classifier/qc_sqlite/qc_sqlite.cc index e61ffcb8e..6079ccd9f 100644 --- a/query_classifier/qc_sqlite/qc_sqlite.cc +++ b/query_classifier/qc_sqlite/qc_sqlite.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/query_classifier/test/compare.cc b/query_classifier/test/compare.cc index c6ec919d7..bcad32646 100644 --- a/query_classifier/test/compare.cc +++ b/query_classifier/test/compare.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include "../../server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh" #include "testreader.hh" diff --git a/query_classifier/test/qc_cache.cc b/query_classifier/test/qc_cache.cc index 85be55100..401a96b07 100644 --- a/query_classifier/test/qc_cache.cc +++ b/query_classifier/test/qc_cache.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/query_classifier/test/version_sensitivity.cc b/query_classifier/test/version_sensitivity.cc index 77d5c0de0..b9d4c38ba 100644 --- a/query_classifier/test/version_sensitivity.cc +++ b/query_classifier/test/version_sensitivity.cc @@ -16,7 +16,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/server/core/backend.cc b/server/core/backend.cc index f8ee909c3..4bc444794 100644 --- a/server/core/backend.cc +++ b/server/core/backend.cc @@ -17,7 +17,7 @@ #include -#include +#include using namespace maxscale; diff --git a/server/core/modutil.cc b/server/core/modutil.cc index ccefaaaed..b6e8d8535 100644 --- a/server/core/modutil.cc +++ b/server/core/modutil.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/server/core/mysql_binlog.cc b/server/core/mysql_binlog.cc index 677171f88..3c451551e 100644 --- a/server/core/mysql_binlog.cc +++ b/server/core/mysql_binlog.cc @@ -24,7 +24,7 @@ #include #include -#include +#include static uint64_t unpack_bytes(uint8_t* ptr, size_t bytes); diff --git a/server/core/queryclassifier.cc b/server/core/queryclassifier.cc index eb4aaf796..2f6b0bb57 100644 --- a/server/core/queryclassifier.cc +++ b/server/core/queryclassifier.cc @@ -16,7 +16,7 @@ #include #include #include -#include +#include namespace { diff --git a/server/core/resultset.cc b/server/core/resultset.cc index 55a9246d7..cf9077fa2 100644 --- a/server/core/resultset.cc +++ b/server/core/resultset.cc @@ -20,7 +20,7 @@ #include #include #include -#include +#include /** * Send the field count packet in a response packet sequence. diff --git a/server/core/secrets.cc b/server/core/secrets.cc index 7fb208104..525e1f484 100644 --- a/server/core/secrets.cc +++ b/server/core/secrets.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/server/core/session.cc b/server/core/session.cc index dc6aa0d79..d020637d5 100644 --- a/server/core/session.cc +++ b/server/core/session.cc @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "internal/dcb.hh" #include "internal/filter.hh" diff --git a/server/core/session_command.cc b/server/core/session_command.cc index bcf8871a6..af544acea 100644 --- a/server/core/session_command.cc +++ b/server/core/session_command.cc @@ -14,7 +14,7 @@ #include #include -#include +#include namespace maxscale { diff --git a/server/core/test/test_session_track.cc b/server/core/test/test_session_track.cc index 6c22eb2d0..910b27acb 100644 --- a/server/core/test/test_session_track.cc +++ b/server/core/test/test_session_track.cc @@ -4,7 +4,7 @@ #include #include -#include +#include MySQLProtocol proto; diff --git a/server/core/test/test_trxcompare.cc b/server/core/test/test_trxcompare.cc index 79c9c1949..ba7ae47fe 100644 --- a/server/core/test/test_trxcompare.cc +++ b/server/core/test/test_trxcompare.cc @@ -19,7 +19,7 @@ #include "../internal/query_classifier.hh" #include #include -#include +#include #include "../../../query_classifier/test/testreader.hh" using namespace std; diff --git a/server/core/test/test_trxtracking.cc b/server/core/test/test_trxtracking.cc index b3f13a5d4..36a8493de 100644 --- a/server/core/test/test_trxtracking.cc +++ b/server/core/test/test_trxtracking.cc @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "../core/internal/query_classifier.hh" using namespace std; diff --git a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc index 668d54541..d06525c3c 100644 --- a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc +++ b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc index 04a25fc82..3e2985471 100644 --- a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc +++ b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include "../gssapi_auth.h" diff --git a/server/modules/authenticator/MySQLAuth/dbusers.cc b/server/modules/authenticator/MySQLAuth/dbusers.cc index 12b4c0169..626e7d363 100644 --- a/server/modules/authenticator/MySQLAuth/dbusers.cc +++ b/server/modules/authenticator/MySQLAuth/dbusers.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/authenticator/MySQLAuth/mysql_auth.cc b/server/modules/authenticator/MySQLAuth/mysql_auth.cc index 4fd2e585d..3d27d99cc 100644 --- a/server/modules/authenticator/MySQLAuth/mysql_auth.cc +++ b/server/modules/authenticator/MySQLAuth/mysql_auth.cc @@ -27,7 +27,7 @@ #include "mysql_auth.hh" -#include +#include #include #include #include diff --git a/server/modules/authenticator/MySQLAuth/mysql_auth.hh b/server/modules/authenticator/MySQLAuth/mysql_auth.hh index 737226c68..5874f53cd 100644 --- a/server/modules/authenticator/MySQLAuth/mysql_auth.hh +++ b/server/modules/authenticator/MySQLAuth/mysql_auth.hh @@ -24,7 +24,7 @@ #include #include #include -#include +#include MXS_BEGIN_DECLS diff --git a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.cc b/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.cc index a01a9b3ae..9cde45cb7 100644 --- a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.cc +++ b/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/server/modules/authenticator/NullAuthAllow/null_auth_allow.cc b/server/modules/authenticator/NullAuthAllow/null_auth_allow.cc index a48d20935..3d34b8ed9 100644 --- a/server/modules/authenticator/NullAuthAllow/null_auth_allow.cc +++ b/server/modules/authenticator/NullAuthAllow/null_auth_allow.cc @@ -36,7 +36,7 @@ #include /** MXS-1026: Without MySQL protocol data structures, the NullAuth authenticator will crash. */ -#include +#include static bool null_auth_set_protocol_data(DCB* dcb, GWBUF* buf); static bool null_auth_is_client_ssl_capable(DCB* dcb); diff --git a/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh b/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh index 0777b1178..4120f0eaa 100644 --- a/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh +++ b/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh @@ -23,7 +23,7 @@ #include #include #include -#include +#include using std::string; diff --git a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh index a667b1076..8e32571f2 100644 --- a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh +++ b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh @@ -21,4 +21,4 @@ #include #include -#include +#include diff --git a/server/modules/filter/binlogfilter/binlogfiltersession.cc b/server/modules/filter/binlogfilter/binlogfiltersession.cc index a1e40dd35..8f750d65b 100644 --- a/server/modules/filter/binlogfilter/binlogfiltersession.cc +++ b/server/modules/filter/binlogfilter/binlogfiltersession.cc @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/server/modules/filter/cache/cache_storage_api.hh b/server/modules/filter/cache/cache_storage_api.hh index aff1b41e4..c203510b2 100644 --- a/server/modules/filter/cache/cache_storage_api.hh +++ b/server/modules/filter/cache/cache_storage_api.hh @@ -22,7 +22,7 @@ #include #include -#include +#include typedef enum cache_result_bits { diff --git a/server/modules/filter/cache/rules.cc b/server/modules/filter/cache/rules.cc index 0d8652792..d287fbc81 100644 --- a/server/modules/filter/cache/rules.cc +++ b/server/modules/filter/cache/rules.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/server/modules/filter/cache/test/testrules.cc b/server/modules/filter/cache/test/testrules.cc index 39540d275..e19c64e40 100644 --- a/server/modules/filter/cache/test/testrules.cc +++ b/server/modules/filter/cache/test/testrules.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include using namespace std; diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.cc b/server/modules/filter/dbfwfilter/dbfwfilter.cc index 19b7e7178..8c9b2ce84 100644 --- a/server/modules/filter/dbfwfilter/dbfwfilter.cc +++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc @@ -73,7 +73,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/dbfwfilter/rules.cc b/server/modules/filter/dbfwfilter/rules.cc index f9af2ae1f..d3bf3cfff 100644 --- a/server/modules/filter/dbfwfilter/rules.cc +++ b/server/modules/filter/dbfwfilter/rules.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include static inline bool query_is_sql(GWBUF* query) { diff --git a/server/modules/filter/dbfwfilter/user.cc b/server/modules/filter/dbfwfilter/user.cc index 88d39e124..b2df9dd8e 100644 --- a/server/modules/filter/dbfwfilter/user.cc +++ b/server/modules/filter/dbfwfilter/user.cc @@ -15,7 +15,7 @@ #include #include -#include +#include User::User(std::string name) : m_name(name) diff --git a/server/modules/filter/insertstream/insertstream.cc b/server/modules/filter/insertstream/insertstream.cc index 53290e73b..75a7de559 100644 --- a/server/modules/filter/insertstream/insertstream.cc +++ b/server/modules/filter/insertstream/insertstream.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include /** diff --git a/server/modules/filter/masking/maskingfiltersession.cc b/server/modules/filter/masking/maskingfiltersession.cc index 7dd331216..940d91f1e 100644 --- a/server/modules/filter/masking/maskingfiltersession.cc +++ b/server/modules/filter/masking/maskingfiltersession.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "maskingfilter.hh" #include "mysql.hh" diff --git a/server/modules/filter/masking/mysql.hh b/server/modules/filter/masking/mysql.hh index b434ca764..f252dd31c 100644 --- a/server/modules/filter/masking/mysql.hh +++ b/server/modules/filter/masking/mysql.hh @@ -19,7 +19,7 @@ #include #include #include -#include +#include /** * @class LEncInt diff --git a/server/modules/filter/maxrows/maxrows.cc b/server/modules/filter/maxrows/maxrows.cc index b36705bb5..609cdc21b 100644 --- a/server/modules/filter/maxrows/maxrows.cc +++ b/server/modules/filter/maxrows/maxrows.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include "maxrows.h" diff --git a/server/modules/filter/mqfilter/mqfilter.cc b/server/modules/filter/mqfilter/mqfilter.cc index edb2a057b..cfcbe272a 100644 --- a/server/modules/filter/mqfilter/mqfilter.cc +++ b/server/modules/filter/mqfilter/mqfilter.cc @@ -72,7 +72,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/test/maxscale/mock/session.hh b/server/modules/filter/test/maxscale/mock/session.hh index 3f6cda073..faece4f9d 100644 --- a/server/modules/filter/test/maxscale/mock/session.hh +++ b/server/modules/filter/test/maxscale/mock/session.hh @@ -13,8 +13,9 @@ #pragma once #include "mock.hh" -#include +#include #include +#include #include "client.hh" #include "../../../core/internal/session.hh" diff --git a/server/modules/filter/test/mock.cc b/server/modules/filter/test/mock.cc index 6f65afc42..cd7ac67cd 100644 --- a/server/modules/filter/test/mock.cc +++ b/server/modules/filter/test/mock.cc @@ -12,7 +12,7 @@ */ #include "maxscale/mock/mock.hh" -#include +#include namespace maxscale diff --git a/server/modules/filter/test/mock_backend.cc b/server/modules/filter/test/mock_backend.cc index fe009a591..221a0becd 100644 --- a/server/modules/filter/test/mock_backend.cc +++ b/server/modules/filter/test/mock_backend.cc @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include using namespace std; diff --git a/server/modules/monitor/grmon/grmon.cc b/server/modules/monitor/grmon/grmon.cc index 0f5103525..11c4dea16 100644 --- a/server/modules/monitor/grmon/grmon.cc +++ b/server/modules/monitor/grmon/grmon.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc index 491f1cb6d..9aac6bf7b 100644 --- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc +++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc index a0d39bb56..05200586c 100644 --- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc +++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/protocol/MySQL/mariadbclient/setparser.hh b/server/modules/protocol/MySQL/mariadbclient/setparser.hh index 01def2404..0f401eb88 100644 --- a/server/modules/protocol/MySQL/mariadbclient/setparser.hh +++ b/server/modules/protocol/MySQL/mariadbclient/setparser.hh @@ -15,7 +15,7 @@ #include #include #include -#include +#include class SetParser : public maxscale::CustomParser diff --git a/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh b/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh index a5a86412f..f4a618548 100644 --- a/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh +++ b/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh @@ -14,7 +14,7 @@ #include #include -#include +#include class SetSqlModeParser : public maxscale::CustomParser diff --git a/server/modules/protocol/MySQL/mariadbclient/sqlmodeparser.hh b/server/modules/protocol/MySQL/mariadbclient/sqlmodeparser.hh index 4f4ae9aaa..5a2613393 100644 --- a/server/modules/protocol/MySQL/mariadbclient/sqlmodeparser.hh +++ b/server/modules/protocol/MySQL/mariadbclient/sqlmodeparser.hh @@ -14,7 +14,7 @@ #include #include -#include +#include class SqlModeParser : public maxscale::CustomParser diff --git a/server/modules/protocol/MySQL/mysql_common.cc b/server/modules/protocol/MySQL/mysql_common.cc index a4a6c5dcf..5ee7bcaae 100644 --- a/server/modules/protocol/MySQL/mysql_common.cc +++ b/server/modules/protocol/MySQL/mysql_common.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/protocol/MySQL/rwbackend.cc b/server/modules/protocol/MySQL/rwbackend.cc index 2ec0aa52a..b9f18a821 100644 --- a/server/modules/protocol/MySQL/rwbackend.cc +++ b/server/modules/protocol/MySQL/rwbackend.cc @@ -14,7 +14,7 @@ #include #include -#include +#include #include namespace maxscale diff --git a/server/modules/routing/avrorouter/avro.cc b/server/modules/routing/avrorouter/avro.cc index 3a496481b..2b8fd8571 100644 --- a/server/modules/routing/avrorouter/avro.cc +++ b/server/modules/routing/avrorouter/avro.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/avrorouter/avro_main.cc b/server/modules/routing/avrorouter/avro_main.cc index 45570d494..3bef72e18 100644 --- a/server/modules/routing/avrorouter/avro_main.cc +++ b/server/modules/routing/avrorouter/avro_main.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/avrorouter/avrorouter.hh b/server/modules/routing/avrorouter/avrorouter.hh index e1a80e34c..acf71d538 100644 --- a/server/modules/routing/avrorouter/avrorouter.hh +++ b/server/modules/routing/avrorouter/avrorouter.hh @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include "rpl.hh" diff --git a/server/modules/routing/avrorouter/rpl.cc b/server/modules/routing/avrorouter/rpl.cc index 742ec6128..8fd8e63f2 100644 --- a/server/modules/routing/avrorouter/rpl.cc +++ b/server/modules/routing/avrorouter/rpl.cc @@ -19,7 +19,7 @@ #include #include -#include +#include void gtid_pos_t::extract(const REP_HEADER& hdr, uint8_t* ptr) { diff --git a/server/modules/routing/binlogrouter/blr.cc b/server/modules/routing/binlogrouter/blr.cc index 2f26309d7..a032b7cc1 100644 --- a/server/modules/routing/binlogrouter/blr.cc +++ b/server/modules/routing/binlogrouter/blr.cc @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/binlogrouter/blr.hh b/server/modules/routing/binlogrouter/blr.hh index eff7e8e57..15d22bffe 100644 --- a/server/modules/routing/binlogrouter/blr.hh +++ b/server/modules/routing/binlogrouter/blr.hh @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/binlogrouter/blr_master.cc b/server/modules/routing/binlogrouter/blr_master.cc index b0d684486..e9ce1be0d 100644 --- a/server/modules/routing/binlogrouter/blr_master.cc +++ b/server/modules/routing/binlogrouter/blr_master.cc @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/binlogrouter/test/testbinlog.cc b/server/modules/routing/binlogrouter/test/testbinlog.cc index 4898e33d2..68b56dcf6 100644 --- a/server/modules/routing/binlogrouter/test/testbinlog.cc +++ b/server/modules/routing/binlogrouter/test/testbinlog.cc @@ -42,7 +42,7 @@ #include "../../../../core/internal/modules.hh" #include "../../../../core/internal/config.hh" -#include +#include #include #include #include diff --git a/server/modules/routing/cat/catsession.cc b/server/modules/routing/cat/catsession.cc index fc3ce1d9a..f5e45a931 100644 --- a/server/modules/routing/cat/catsession.cc +++ b/server/modules/routing/cat/catsession.cc @@ -13,7 +13,7 @@ #include "cat.hh" #include "catsession.hh" -#include +#include #include using namespace maxscale; diff --git a/server/modules/routing/maxinfo/maxinfo.cc b/server/modules/routing/maxinfo/maxinfo.cc index 71643897e..f7e2b66fc 100644 --- a/server/modules/routing/maxinfo/maxinfo.cc +++ b/server/modules/routing/maxinfo/maxinfo.cc @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "../../../core/internal/modules.hh" #include "../../../core/internal/monitor.hh" diff --git a/server/modules/routing/readconnroute/readconnroute.cc b/server/modules/routing/readconnroute/readconnroute.cc index 12ee332dd..0c9fb1c93 100644 --- a/server/modules/routing/readconnroute/readconnroute.cc +++ b/server/modules/routing/readconnroute/readconnroute.cc @@ -85,7 +85,7 @@ #include #include #include -#include +#include #include #include diff --git a/server/modules/routing/readwritesplit/readwritesplit.hh b/server/modules/routing/readwritesplit/readwritesplit.hh index 3a697be1f..d389e887f 100644 --- a/server/modules/routing/readwritesplit/readwritesplit.hh +++ b/server/modules/routing/readwritesplit/readwritesplit.hh @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/readwritesplit/rwsplit_mysql.cc b/server/modules/routing/readwritesplit/rwsplit_mysql.cc index f7df62a7a..349a17c5e 100644 --- a/server/modules/routing/readwritesplit/rwsplit_mysql.cc +++ b/server/modules/routing/readwritesplit/rwsplit_mysql.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include /** diff --git a/server/modules/routing/schemarouter/schemaroutersession.hh b/server/modules/routing/schemarouter/schemaroutersession.hh index f89172622..88a783266 100644 --- a/server/modules/routing/schemarouter/schemaroutersession.hh +++ b/server/modules/routing/schemarouter/schemaroutersession.hh @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include