From 9572330857e4d4e87f472f4343fdb01b4ab1c7af Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Mon, 13 Jul 2020 18:44:45 +0300 Subject: [PATCH] MXS-2900 Rename maxtest headers to .hh --- maxscale-system-test/alter_router.cpp | 2 +- maxscale-system-test/avro.cpp | 8 ++++---- maxscale-system-test/avro_alter.cpp | 2 +- maxscale-system-test/backend_auth_fail.cpp | 2 +- maxscale-system-test/binary_ps.cpp | 2 +- maxscale-system-test/binary_ps_cursor.cpp | 2 +- maxscale-system-test/binlog_change_master.cpp | 2 +- maxscale-system-test/binlog_change_master_common.cpp | 2 +- maxscale-system-test/binlog_change_master_gtid.cpp | 2 +- maxscale-system-test/binlog_incompl.cpp | 2 +- maxscale-system-test/binlog_semisync.cpp | 4 ++-- maxscale-system-test/bug143.cpp | 2 +- maxscale-system-test/bug448.cpp | 4 ++-- maxscale-system-test/bug471.cpp | 2 +- maxscale-system-test/bug473.cpp | 2 +- maxscale-system-test/bug475.cpp | 2 +- maxscale-system-test/bug519.cpp | 4 ++-- maxscale-system-test/bug529.cpp | 4 ++-- maxscale-system-test/bug547.cpp | 2 +- maxscale-system-test/bug565.cpp | 2 +- maxscale-system-test/bug571.cpp | 2 +- maxscale-system-test/bug572.cpp | 2 +- maxscale-system-test/bug587.cpp | 2 +- maxscale-system-test/bug592.cpp | 2 +- maxscale-system-test/bug601.cpp | 2 +- maxscale-system-test/bug620.cpp | 2 +- maxscale-system-test/bug626.cpp | 2 +- maxscale-system-test/bug653.cpp | 2 +- maxscale-system-test/bug654.cpp | 4 ++-- maxscale-system-test/bug658.cpp | 2 +- maxscale-system-test/bug662.cpp | 4 ++-- maxscale-system-test/bug664.cpp | 2 +- maxscale-system-test/bug673.cpp | 4 ++-- maxscale-system-test/bug676.cpp | 2 +- maxscale-system-test/bug681.cpp | 4 ++-- maxscale-system-test/bug705.cpp | 4 ++-- maxscale-system-test/bug729.cpp | 2 +- maxscale-system-test/bug730.cpp | 2 +- maxscale-system-test/bulk_insert.cpp | 2 +- maxscale-system-test/cache_runtime.cpp | 2 +- maxscale-system-test/cache_runtime_ttl.cpp | 2 +- maxscale-system-test/ccrfilter.cpp | 2 +- maxscale-system-test/ccrfilter_global.cpp | 2 +- maxscale-system-test/cdc_client.cpp | 6 +++--- maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp | 2 +- maxscale-system-test/change_master_during_session.cpp | 4 ++-- maxscale-system-test/change_user.cpp | 2 +- maxscale-system-test/check_backend.cpp | 2 +- maxscale-system-test/clustrix_basics.cpp | 2 +- maxscale-system-test/clustrix_distribution.cpp | 2 +- maxscale-system-test/clustrix_mon.cpp | 2 +- maxscale-system-test/clustrix_transaction_replay.cpp | 2 +- maxscale-system-test/compound_statement.cpp | 2 +- maxscale-system-test/config_test.cpp | 2 +- maxscale-system-test/connect_to_nonexisting_db.cpp | 4 ++-- maxscale-system-test/connection_limit.cpp | 2 +- maxscale-system-test/crash_on_bad_sescmd.cpp | 2 +- maxscale-system-test/crash_out_of_files.cpp | 4 ++-- maxscale-system-test/create_rds.cpp | 2 +- maxscale-system-test/csmon_test.cpp | 2 +- maxscale-system-test/delete_rds.cpp | 2 +- maxscale-system-test/different_size_binlog.cpp | 4 ++-- maxscale-system-test/different_size_rwsplit.cpp | 4 ++-- maxscale-system-test/encrypted_passwords.cpp | 2 +- maxscale-system-test/error_messages.cpp | 2 +- maxscale-system-test/false_monitor_state_change.cpp | 2 +- maxscale-system-test/fwf.cpp | 8 ++++---- maxscale-system-test/fwf2.cpp | 8 ++++---- maxscale-system-test/fwf_actions.cpp | 4 ++-- maxscale-system-test/fwf_com_ping.cpp | 4 ++-- maxscale-system-test/fwf_duplicate_rules.cpp | 4 ++-- maxscale-system-test/fwf_logging.cpp | 4 ++-- maxscale-system-test/fwf_prepared_stmt.cpp | 4 ++-- maxscale-system-test/fwf_reload.cpp | 8 ++++---- maxscale-system-test/fwf_strict.cpp | 4 ++-- maxscale-system-test/fwf_syntax.cpp | 4 ++-- maxscale-system-test/galera_priority.cpp | 2 +- maxscale-system-test/kerberos_setup.cpp | 2 +- maxscale-system-test/kill_master.cpp | 2 +- maxscale-system-test/kill_query.cpp | 2 +- maxscale-system-test/load_balancing.cpp | 4 ++-- maxscale-system-test/local_address.cpp | 2 +- maxscale-system-test/long_sysbench.cpp | 2 +- maxscale-system-test/long_test.cpp | 4 ++-- maxscale-system-test/longblob.cpp | 4 ++-- maxscale-system-test/lots_of_rows.cpp | 4 ++-- .../mariadbmonitor/fail_switch_rejoin_common.cpp | 2 +- .../mariadbmonitor/mysqlmon_detect_standalone_master.cpp | 2 +- .../mariadbmonitor/mysqlmon_enforce_simple.cpp | 2 +- .../mariadbmonitor/mysqlmon_external_master.cpp | 2 +- .../mariadbmonitor/mysqlmon_fail_switch_events.cpp | 2 +- .../mariadbmonitor/mysqlmon_fail_switch_multi.cpp | 2 +- .../mariadbmonitor/mysqlmon_failover_auto.cpp | 2 +- .../mariadbmonitor/mysqlmon_failover_manual.cpp | 2 +- .../mariadbmonitor/mysqlmon_failover_manual2.cpp | 2 +- .../mariadbmonitor/mysqlmon_failover_no_slaves.cpp | 2 +- .../mariadbmonitor/mysqlmon_failover_readonly.cpp | 2 +- .../mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp | 2 +- .../mariadbmonitor/mysqlmon_failover_rolling_master.cpp | 2 +- .../mysqlmon_failover_rolling_restart_slaves.cpp | 2 +- .../mariadbmonitor/mysqlmon_failover_stress.cpp | 2 +- .../mariadbmonitor/mysqlmon_multimaster.cpp | 6 +++--- .../mariadbmonitor/mysqlmon_rejoin_bad.cpp | 2 +- .../mariadbmonitor/mysqlmon_rejoin_bad2.cpp | 2 +- .../mariadbmonitor/mysqlmon_rejoin_manual2.cpp | 2 +- .../mariadbmonitor/mysqlmon_reset_replication.cpp | 2 +- .../mariadbmonitor/mysqlmon_switchover.cpp | 2 +- .../mariadbmonitor/mysqlmon_switchover_auto.cpp | 2 +- .../mariadbmonitor/mysqlmon_switchover_bad_master.cpp | 2 +- .../mariadbmonitor/mysqlmon_switchover_stress.cpp | 2 +- .../mariadbmonitor/verify_master_failure.cpp | 2 +- maxscale-system-test/masking_auto_firewall.cpp | 2 +- maxscale-system-test/max_connections.cpp | 2 +- maxscale-system-test/maxctrl_basic.cpp | 2 +- maxscale-system-test/maxinfo_sql.cpp | 2 +- maxscale-system-test/maxscale_process_user.cpp | 2 +- .../maxtest/include/maxtest/{big_load.h => big_load.hh} | 0 .../maxtest/include/maxtest/{blob_test.h => blob_test.hh} | 2 +- .../maxtest/{clustrix_nodes.h => clustrix_nodes.hh} | 2 +- .../maxtest/{config_operations.h => config_operations.hh} | 2 +- .../maxtest/{different_size.h => different_size.hh} | 2 +- .../include/maxtest/{fw_copy_rules.h => fw_copy_rules.hh} | 0 .../{get_com_select_insert.h => get_com_select_insert.hh} | 0 .../maxtest/include/maxtest/{get_my_ip.h => get_my_ip.hh} | 0 .../maxtest/{keepalived_func.h => keepalived_func.hh} | 0 .../include/maxtest/{mariadb_func.h => mariadb_func.hh} | 0 .../include/maxtest/{mariadb_nodes.h => mariadb_nodes.hh} | 2 +- .../{maxadmin_operations.h => maxadmin_operations.hh} | 0 .../include/maxtest/{maxinfo_func.h => maxinfo_func.hh} | 0 maxscale-system-test/maxtest/include/maxtest/maxrest.hh | 2 +- maxscale-system-test/maxtest/include/maxtest/maxscales.hh | 4 ++-- maxscale-system-test/maxtest/include/maxtest/nodes.hh | 2 +- .../maxtest/include/maxtest/{rds_vpc.h => rds_vpc.hh} | 2 +- .../maxtest/include/maxtest/{sql_t1.h => sql_t1.hh} | 0 .../maxtest/{test_binlog_fnc.h => test_binlog_fnc.hh} | 0 .../maxtest/{testconnections.h => testconnections.hh} | 4 ++-- maxscale-system-test/maxtest/src/big_load.cc | 8 ++++---- maxscale-system-test/maxtest/src/blob_test.cc | 2 +- maxscale-system-test/maxtest/src/clustrix_nodes.cpp | 2 +- maxscale-system-test/maxtest/src/config_operations.cc | 2 +- maxscale-system-test/maxtest/src/different_size.cc | 2 +- maxscale-system-test/maxtest/src/fw_copy_rules.cc | 4 ++-- maxscale-system-test/maxtest/src/get_com_select_insert.cc | 2 +- maxscale-system-test/maxtest/src/get_my_ip.cc | 2 +- maxscale-system-test/maxtest/src/keepalived_func.cc | 6 +++--- maxscale-system-test/maxtest/src/mariadb_func.cc | 2 +- maxscale-system-test/maxtest/src/mariadb_nodes.cc | 2 +- maxscale-system-test/maxtest/src/maxadmin_operations.cc | 2 +- maxscale-system-test/maxtest/src/maxinfo_func.cc | 4 ++-- maxscale-system-test/maxtest/src/rds_vpc.cc | 2 +- maxscale-system-test/maxtest/src/sql_t1.cc | 4 ++-- maxscale-system-test/maxtest/src/test_binlog_fnc.cc | 8 ++++---- maxscale-system-test/maxtest/src/testconnections.cc | 8 ++++---- maxscale-system-test/mm.cpp | 6 +++--- maxscale-system-test/mxs1045.cpp | 2 +- maxscale-system-test/mxs1071_maxrows.cpp | 8 ++++---- maxscale-system-test/mxs1110_16mb.cpp | 6 +++--- maxscale-system-test/mxs1113_schemarouter_ps.cpp | 2 +- maxscale-system-test/mxs1123.cpp | 2 +- maxscale-system-test/mxs118.cpp | 2 +- maxscale-system-test/mxs1295_sp_call.cpp | 2 +- maxscale-system-test/mxs1310_implicit_db.cpp | 2 +- maxscale-system-test/mxs1319.cpp | 2 +- maxscale-system-test/mxs1323_retry_read.cpp | 2 +- maxscale-system-test/mxs1323_stress.cpp | 2 +- maxscale-system-test/mxs1418.cpp | 2 +- maxscale-system-test/mxs1451_skip_auth.cpp | 2 +- maxscale-system-test/mxs1457_ignore_deleted.cpp | 2 +- maxscale-system-test/mxs1468.cpp | 2 +- maxscale-system-test/mxs1476.cpp | 2 +- maxscale-system-test/mxs1503_extra_slaves.cpp | 2 +- maxscale-system-test/mxs1503_master_reconnection.cpp | 2 +- maxscale-system-test/mxs1503_queued_sescmd.cpp | 2 +- maxscale-system-test/mxs1506_delayed_retry.cpp | 2 +- maxscale-system-test/mxs1506_no_master.cpp | 2 +- maxscale-system-test/mxs1507_inconsistent_trx.cpp | 2 +- maxscale-system-test/mxs1507_migrate_trx.cpp | 2 +- maxscale-system-test/mxs1507_trx_replay.cpp | 2 +- maxscale-system-test/mxs1507_trx_stress.cpp | 2 +- maxscale-system-test/mxs1509.cpp | 2 +- maxscale-system-test/mxs1516.cpp | 2 +- maxscale-system-test/mxs1542.cpp | 2 +- maxscale-system-test/mxs1543.cpp | 2 +- maxscale-system-test/mxs1549_optimistic_trx.cpp | 2 +- maxscale-system-test/mxs1583_fwf.cpp | 4 ++-- maxscale-system-test/mxs1585.cpp | 2 +- maxscale-system-test/mxs1628_bad_handshake.cpp | 2 +- maxscale-system-test/mxs1643_extra_events.cpp | 2 +- maxscale-system-test/mxs1653_ps_hang.cpp | 2 +- maxscale-system-test/mxs1662_pam_admin.cpp | 2 +- maxscale-system-test/mxs1677_temp_table.cpp | 2 +- maxscale-system-test/mxs1678_relay_master.cpp | 2 +- maxscale-system-test/mxs1713_lots_of_databases.cpp | 2 +- maxscale-system-test/mxs1719.cpp | 2 +- maxscale-system-test/mxs1731_old_persisted_config.cpp | 2 +- maxscale-system-test/mxs173_throttle_filter.cpp | 2 +- maxscale-system-test/mxs1743_rconn_bitmask.cpp | 2 +- .../mxs1751_available_when_donor_crash.cpp | 2 +- maxscale-system-test/mxs1760_use_sql_variables_in.cpp | 2 +- maxscale-system-test/mxs1773_failing_ldli.cpp | 2 +- maxscale-system-test/mxs1776_ps_exec_hang.cpp | 2 +- maxscale-system-test/mxs1778_causal_reads.cpp | 2 +- maxscale-system-test/mxs1787_call_ps.cpp | 2 +- maxscale-system-test/mxs1787_slave_reconnection.cpp | 2 +- maxscale-system-test/mxs1804_long_ps_hang.cpp | 2 +- maxscale-system-test/mxs1808_long_data.cpp | 2 +- maxscale-system-test/mxs1824_double_cursor.cpp | 2 +- maxscale-system-test/mxs1828_double_local_infile.cpp | 2 +- maxscale-system-test/mxs1831_unknown_param.cpp | 2 +- maxscale-system-test/mxs1836_show_eventTimes.cpp | 2 +- maxscale-system-test/mxs1849_table_sharding.cpp | 2 +- maxscale-system-test/mxs1873_large_sescmd.cpp | 2 +- maxscale-system-test/mxs1889.cpp | 2 +- maxscale-system-test/mxs1896_load_data_infile.cpp | 2 +- maxscale-system-test/mxs1899_generated_cnf.cpp | 2 +- maxscale-system-test/mxs1926_killed_server.cpp | 2 +- maxscale-system-test/mxs1929_filter_runtime.cpp | 2 +- maxscale-system-test/mxs1929_service_runtime.cpp | 2 +- maxscale-system-test/mxs1929_start_from_scratch.cpp | 2 +- maxscale-system-test/mxs1932_hidden_cnf.cpp | 2 +- maxscale-system-test/mxs1947_composite_roles.cpp | 2 +- maxscale-system-test/mxs1949_warn_user_injection.cpp | 2 +- maxscale-system-test/mxs1958_insert_priv.cpp | 2 +- maxscale-system-test/mxs1961_standalone_rejoin.cpp | 2 +- maxscale-system-test/mxs1980_blr_galera_server_ids.cpp | 2 +- maxscale-system-test/mxs1985_kill_hang.cpp | 2 +- maxscale-system-test/mxs2037_namedserver_wildcards.cpp | 2 +- maxscale-system-test/mxs2043_select_for_update.cpp | 2 +- maxscale-system-test/mxs2054_hybrid_cluster.cpp | 2 +- maxscale-system-test/mxs2057_systemd_watchdog.cpp | 2 +- maxscale-system-test/mxs2106_avro_null.cpp | 2 +- maxscale-system-test/mxs2111_auth_string.cpp | 2 +- maxscale-system-test/mxs2115_version_string.cpp | 2 +- maxscale-system-test/mxs2167_extra_port.cpp | 2 +- maxscale-system-test/mxs2187_multi_replay.cpp | 2 +- maxscale-system-test/mxs2250_describe_temp_table.cpp | 4 ++-- maxscale-system-test/mxs2273_being_drained.cpp | 2 +- maxscale-system-test/mxs2295_change_user_loop.cpp | 2 +- maxscale-system-test/mxs2300_history_pruning.cpp | 2 +- maxscale-system-test/mxs2313_rank.cpp | 2 +- maxscale-system-test/mxs2326_hint_clone.cpp | 2 +- maxscale-system-test/mxs2350_lazy_connect.cpp | 2 +- maxscale-system-test/mxs2355_wrong_auth.cpp | 2 +- maxscale-system-test/mxs2414_host_blocking.cpp | 2 +- maxscale-system-test/mxs2417_ignore_persisted_cnf.cpp | 2 +- maxscale-system-test/mxs2441_galera_slaves.cpp | 2 +- maxscale-system-test/mxs244_prepared_stmt_loop.cpp | 2 +- maxscale-system-test/mxs2450_change_user_crash.cpp | 2 +- maxscale-system-test/mxs2456_trx_replay_cap.cpp | 2 +- maxscale-system-test/mxs2464_sescmd_reconnect.cpp | 2 +- maxscale-system-test/mxs2490_ps_execute_direct.cpp | 2 +- maxscale-system-test/mxs2512_trx_replay_rollback.cpp | 4 ++-- maxscale-system-test/mxs2520_master_read_reconnect.cpp | 2 +- maxscale-system-test/mxs2521_double_exec.cpp | 2 +- maxscale-system-test/mxs2563_concurrent_slave_failure.cpp | 2 +- maxscale-system-test/mxs2609_history_replay.cpp | 2 +- maxscale-system-test/mxs2621_lower_case_tables.cpp | 2 +- maxscale-system-test/mxs2631_ignore_system_tables.cpp | 2 +- maxscale-system-test/mxs2785_binlogfilter_rewrite.cpp | 2 +- maxscale-system-test/mxs280_select_outfile.cpp | 4 ++-- maxscale-system-test/mxs2878_monitor_ssl.cpp | 2 +- maxscale-system-test/mxs2919_broken_slaves.cpp | 2 +- maxscale-system-test/mxs2939_sescmd_reconnect.cpp | 2 +- maxscale-system-test/mxs2972_shard_caching.cc | 2 +- maxscale-system-test/mxs314.cpp | 2 +- maxscale-system-test/mxs321.cpp | 4 ++-- maxscale-system-test/mxs359_error_on_write.cpp | 2 +- maxscale-system-test/mxs359_master_switch.cpp | 2 +- maxscale-system-test/mxs359_read_only.cpp | 2 +- maxscale-system-test/mxs365.cpp | 2 +- maxscale-system-test/mxs37_table_privilege.cpp | 4 ++-- maxscale-system-test/mxs421_events.cpp | 2 +- maxscale-system-test/mxs431.cpp | 2 +- maxscale-system-test/mxs548_short_session_change_user.cpp | 4 ++-- maxscale-system-test/mxs559_block_master.cpp | 4 ++-- maxscale-system-test/mxs564_big_dump.cpp | 4 ++-- maxscale-system-test/mxs621_unreadable_cnf.cpp | 2 +- maxscale-system-test/mxs657_restart.cpp | 6 +++--- maxscale-system-test/mxs657_restart_service.cpp | 2 +- maxscale-system-test/mxs701_binlog_filter.cpp | 2 +- maxscale-system-test/mxs716.cpp | 4 ++-- maxscale-system-test/mxs722.cpp | 2 +- maxscale-system-test/mxs729_maxadmin.cpp | 2 +- maxscale-system-test/mxs781_binlog_wrong_passwrd.cpp | 6 +++--- maxscale-system-test/mxs812_1.cpp | 2 +- maxscale-system-test/mxs812_2.cpp | 2 +- maxscale-system-test/mxs813_long_hostname.cpp | 2 +- maxscale-system-test/mxs822_maxpasswd.cpp | 2 +- maxscale-system-test/mxs827_write_timeout.cpp | 4 ++-- maxscale-system-test/mxs872_roles.cpp | 2 +- maxscale-system-test/mxs874_slave_recovery.cpp | 2 +- maxscale-system-test/mxs922_bad_server.cpp | 2 +- maxscale-system-test/mxs922_double_listener.cpp | 2 +- maxscale-system-test/mxs922_listener_ssl.cpp | 4 ++-- maxscale-system-test/mxs922_monitor.cpp | 2 +- maxscale-system-test/mxs922_restart.cpp | 2 +- maxscale-system-test/mxs922_scaling.cpp | 4 ++-- maxscale-system-test/mxs922_server.cpp | 4 ++-- maxscale-system-test/mxs951_utfmb4.cpp | 2 +- maxscale-system-test/namedserverfilter.cpp | 2 +- maxscale-system-test/no_password.cpp | 2 +- maxscale-system-test/non_native_setup.cpp | 2 +- maxscale-system-test/open_close_connections.cpp | 2 +- maxscale-system-test/pam_authentication.cpp | 2 +- maxscale-system-test/pers_01.cpp | 4 ++-- maxscale-system-test/pers_02.cpp | 4 ++-- maxscale-system-test/prepared_statement.cpp | 4 ++-- maxscale-system-test/proxy_protocol.cpp | 2 +- maxscale-system-test/readconnrouter_master.cpp | 2 +- maxscale-system-test/readconnrouter_slave.cpp | 2 +- maxscale-system-test/regexfilter1.cpp | 2 +- maxscale-system-test/rw_select_insert.cpp | 6 +++--- maxscale-system-test/rwsplit_conn_num.cpp | 2 +- maxscale-system-test/rwsplit_connect.cpp | 2 +- maxscale-system-test/rwsplit_multi_stmt.cpp | 2 +- maxscale-system-test/rwsplit_readonly.cpp | 4 ++-- maxscale-system-test/rwsplit_readonly_stress.cpp | 4 ++-- maxscale-system-test/sanity_check.cpp | 2 +- maxscale-system-test/schemarouter_duplicate.cpp | 2 +- maxscale-system-test/script.cpp | 2 +- maxscale-system-test/sequence.cpp | 2 +- maxscale-system-test/server_weight.cpp | 2 +- maxscale-system-test/session_limits.cpp | 2 +- maxscale-system-test/setup_binlog.cpp | 4 ++-- maxscale-system-test/setup_binlog_gtid.cpp | 6 +++--- maxscale-system-test/sharding.cpp | 2 +- maxscale-system-test/sharding_load_data.cpp | 2 +- maxscale-system-test/short_sessions.cpp | 4 ++-- maxscale-system-test/show_monitor_crash.cpp | 2 +- maxscale-system-test/slave_failover.cpp | 2 +- maxscale-system-test/smart_query.cpp | 2 +- maxscale-system-test/sql_queries.cpp | 4 ++-- maxscale-system-test/sr_basics.cpp | 2 +- maxscale-system-test/stale_slaves.cpp | 2 +- maxscale-system-test/sysbench_example.cpp | 2 +- maxscale-system-test/sysbench_kill_slave.cpp | 2 +- maxscale-system-test/temporal_tables.cpp | 4 ++-- maxscale-system-test/test_hints.cpp | 2 +- 338 files changed, 423 insertions(+), 423 deletions(-) rename maxscale-system-test/maxtest/include/maxtest/{big_load.h => big_load.hh} (100%) rename maxscale-system-test/maxtest/include/maxtest/{blob_test.h => blob_test.hh} (97%) rename maxscale-system-test/maxtest/include/maxtest/{clustrix_nodes.h => clustrix_nodes.hh} (98%) rename maxscale-system-test/maxtest/include/maxtest/{config_operations.h => config_operations.hh} (98%) rename maxscale-system-test/maxtest/include/maxtest/{different_size.h => different_size.hh} (96%) rename maxscale-system-test/maxtest/include/maxtest/{fw_copy_rules.h => fw_copy_rules.hh} (100%) rename maxscale-system-test/maxtest/include/maxtest/{get_com_select_insert.h => get_com_select_insert.hh} (100%) rename maxscale-system-test/maxtest/include/maxtest/{get_my_ip.h => get_my_ip.hh} (100%) rename maxscale-system-test/maxtest/include/maxtest/{keepalived_func.h => keepalived_func.hh} (100%) rename maxscale-system-test/maxtest/include/maxtest/{mariadb_func.h => mariadb_func.hh} (100%) rename maxscale-system-test/maxtest/include/maxtest/{mariadb_nodes.h => mariadb_nodes.hh} (99%) rename maxscale-system-test/maxtest/include/maxtest/{maxadmin_operations.h => maxadmin_operations.hh} (100%) rename maxscale-system-test/maxtest/include/maxtest/{maxinfo_func.h => maxinfo_func.hh} (100%) rename maxscale-system-test/maxtest/include/maxtest/{rds_vpc.h => rds_vpc.hh} (99%) rename maxscale-system-test/maxtest/include/maxtest/{sql_t1.h => sql_t1.hh} (100%) rename maxscale-system-test/maxtest/include/maxtest/{test_binlog_fnc.h => test_binlog_fnc.hh} (100%) rename maxscale-system-test/maxtest/include/maxtest/{testconnections.h => testconnections.hh} (99%) diff --git a/maxscale-system-test/alter_router.cpp b/maxscale-system-test/alter_router.cpp index 0da92dd8e..8f913fc6c 100644 --- a/maxscale-system-test/alter_router.cpp +++ b/maxscale-system-test/alter_router.cpp @@ -2,7 +2,7 @@ * Test runtime modification of router options */ -#include +#include #include #include #include diff --git a/maxscale-system-test/avro.cpp b/maxscale-system-test/avro.cpp index 90f7450b8..76d3845c4 100644 --- a/maxscale-system-test/avro.cpp +++ b/maxscale-system-test/avro.cpp @@ -8,10 +8,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include using std::cout; using std::endl; diff --git a/maxscale-system-test/avro_alter.cpp b/maxscale-system-test/avro_alter.cpp index 13edd5126..5bf63a19b 100644 --- a/maxscale-system-test/avro_alter.cpp +++ b/maxscale-system-test/avro_alter.cpp @@ -2,7 +2,7 @@ * @file avro_alter.cpp Test ALTER TABLE handling of avrorouter */ -#include +#include #include #include #include diff --git a/maxscale-system-test/backend_auth_fail.cpp b/maxscale-system-test/backend_auth_fail.cpp index 5316b9669..4923e819d 100644 --- a/maxscale-system-test/backend_auth_fail.cpp +++ b/maxscale-system-test/backend_auth_fail.cpp @@ -4,7 +4,7 @@ * MaxScale should not crash */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/binary_ps.cpp b/maxscale-system-test/binary_ps.cpp index ae00d5efc..757a987ac 100644 --- a/maxscale-system-test/binary_ps.cpp +++ b/maxscale-system-test/binary_ps.cpp @@ -1,7 +1,7 @@ /** * Test binary protocol prepared statement routing */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/binary_ps_cursor.cpp b/maxscale-system-test/binary_ps_cursor.cpp index 7bf0f6501..206f02ac3 100644 --- a/maxscale-system-test/binary_ps_cursor.cpp +++ b/maxscale-system-test/binary_ps_cursor.cpp @@ -1,7 +1,7 @@ /** * Test that binary protocol cursors work as expected */ -#include +#include #include using std::cout; diff --git a/maxscale-system-test/binlog_change_master.cpp b/maxscale-system-test/binlog_change_master.cpp index 74fff5589..836aaaeb2 100644 --- a/maxscale-system-test/binlog_change_master.cpp +++ b/maxscale-system-test/binlog_change_master.cpp @@ -11,7 +11,7 @@ * - check data on all nodes */ -#include +#include #include "binlog_change_master_common.cpp" int main(int argc, char* argv[]) diff --git a/maxscale-system-test/binlog_change_master_common.cpp b/maxscale-system-test/binlog_change_master_common.cpp index 62ed3c023..0aea2954e 100644 --- a/maxscale-system-test/binlog_change_master_common.cpp +++ b/maxscale-system-test/binlog_change_master_common.cpp @@ -1,4 +1,4 @@ -#include +#include #include void run_test(TestConnections& test, std::function cb) diff --git a/maxscale-system-test/binlog_change_master_gtid.cpp b/maxscale-system-test/binlog_change_master_gtid.cpp index 3ced0a804..f8ad1d981 100644 --- a/maxscale-system-test/binlog_change_master_gtid.cpp +++ b/maxscale-system-test/binlog_change_master_gtid.cpp @@ -2,7 +2,7 @@ * The GTID version of binlog_change_master */ -#include +#include #include "binlog_change_master_common.cpp" int main(int argc, char* argv[]) diff --git a/maxscale-system-test/binlog_incompl.cpp b/maxscale-system-test/binlog_incompl.cpp index 2b4daec4e..15f69bc69 100644 --- a/maxscale-system-test/binlog_incompl.cpp +++ b/maxscale-system-test/binlog_incompl.cpp @@ -5,7 +5,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/binlog_semisync.cpp b/maxscale-system-test/binlog_semisync.cpp index 473498b30..e87796582 100644 --- a/maxscale-system-test/binlog_semisync.cpp +++ b/maxscale-system-test/binlog_semisync.cpp @@ -3,8 +3,8 @@ */ #include -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug143.cpp b/maxscale-system-test/bug143.cpp index 55ba22bd9..8b5f19cc3 100644 --- a/maxscale-system-test/bug143.cpp +++ b/maxscale-system-test/bug143.cpp @@ -5,7 +5,7 @@ * - try to connect using RWSplit. First and third are expected to fail, second should succeed. */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug448.cpp b/maxscale-system-test/bug448.cpp index 7d8f25f44..012804711 100644 --- a/maxscale-system-test/bug448.cpp +++ b/maxscale-system-test/bug448.cpp @@ -5,8 +5,8 @@ */ #include -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug471.cpp b/maxscale-system-test/bug471.cpp index 19b234880..9fb6567d1 100644 --- a/maxscale-system-test/bug471.cpp +++ b/maxscale-system-test/bug471.cpp @@ -145,7 +145,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/bug473.cpp b/maxscale-system-test/bug473.cpp index 02d7955ab..99d664114 100644 --- a/maxscale-system-test/bug473.cpp +++ b/maxscale-system-test/bug473.cpp @@ -50,7 +50,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/bug475.cpp b/maxscale-system-test/bug475.cpp index 39861b3c4..0fd3665cd 100644 --- a/maxscale-system-test/bug475.cpp +++ b/maxscale-system-test/bug475.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/bug519.cpp b/maxscale-system-test/bug519.cpp index 03ceded9c..b704d1110 100644 --- a/maxscale-system-test/bug519.cpp +++ b/maxscale-system-test/bug519.cpp @@ -67,8 +67,8 @@ #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/bug529.cpp b/maxscale-system-test/bug529.cpp index 1c77458a2..17d3d96af 100644 --- a/maxscale-system-test/bug529.cpp +++ b/maxscale-system-test/bug529.cpp @@ -126,8 +126,8 @@ #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/bug547.cpp b/maxscale-system-test/bug547.cpp index 9c60e86b1..9ef1b982b 100644 --- a/maxscale-system-test/bug547.cpp +++ b/maxscale-system-test/bug547.cpp @@ -18,7 +18,7 @@ // also relates to bug594 // all slaves in MaxScale config have wrong IP -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug565.cpp b/maxscale-system-test/bug565.cpp index 23001766c..28558122f 100644 --- a/maxscale-system-test/bug565.cpp +++ b/maxscale-system-test/bug565.cpp @@ -53,7 +53,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug571.cpp b/maxscale-system-test/bug571.cpp index d218e9f21..f8f8649d0 100644 --- a/maxscale-system-test/bug571.cpp +++ b/maxscale-system-test/bug571.cpp @@ -115,7 +115,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/bug572.cpp b/maxscale-system-test/bug572.cpp index 2d02389ed..062b905cc 100644 --- a/maxscale-system-test/bug572.cpp +++ b/maxscale-system-test/bug572.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/bug587.cpp b/maxscale-system-test/bug587.cpp index f10829fd0..7ee0a478d 100644 --- a/maxscale-system-test/bug587.cpp +++ b/maxscale-system-test/bug587.cpp @@ -65,7 +65,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/bug592.cpp b/maxscale-system-test/bug592.cpp index 726ba81bf..2b4b6cc17 100644 --- a/maxscale-system-test/bug592.cpp +++ b/maxscale-system-test/bug592.cpp @@ -87,7 +87,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug601.cpp b/maxscale-system-test/bug601.cpp index f37e5861f..7c1de4288 100644 --- a/maxscale-system-test/bug601.cpp +++ b/maxscale-system-test/bug601.cpp @@ -46,7 +46,7 @@ #include -#include +#include using namespace std; diff --git a/maxscale-system-test/bug620.cpp b/maxscale-system-test/bug620.cpp index 0b443a76e..37fb3e293 100644 --- a/maxscale-system-test/bug620.cpp +++ b/maxscale-system-test/bug620.cpp @@ -235,7 +235,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/bug626.cpp b/maxscale-system-test/bug626.cpp index 090e01bf3..ae198e811 100644 --- a/maxscale-system-test/bug626.cpp +++ b/maxscale-system-test/bug626.cpp @@ -2,7 +2,7 @@ * Check that old-style passwords are detected */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug653.cpp b/maxscale-system-test/bug653.cpp index b8ccbe709..3158ac7d5 100644 --- a/maxscale-system-test/bug653.cpp +++ b/maxscale-system-test/bug653.cpp @@ -46,7 +46,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug654.cpp b/maxscale-system-test/bug654.cpp index 15e26595e..2fbe77f70 100644 --- a/maxscale-system-test/bug654.cpp +++ b/maxscale-system-test/bug654.cpp @@ -57,8 +57,8 @@ */ -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug658.cpp b/maxscale-system-test/bug658.cpp index 298edeaba..ca66fd4a0 100644 --- a/maxscale-system-test/bug658.cpp +++ b/maxscale-system-test/bug658.cpp @@ -23,7 +23,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug662.cpp b/maxscale-system-test/bug662.cpp index 919bd76b4..20ef0d546 100644 --- a/maxscale-system-test/bug662.cpp +++ b/maxscale-system-test/bug662.cpp @@ -9,8 +9,8 @@ * - Sleep and check if Maxscale is alive */ -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug664.cpp b/maxscale-system-test/bug664.cpp index 23e5f8fa2..67a2b4c83 100644 --- a/maxscale-system-test/bug664.cpp +++ b/maxscale-system-test/bug664.cpp @@ -6,7 +6,7 @@ * - An error should be logged about the failed branch session */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug673.cpp b/maxscale-system-test/bug673.cpp index d2040d949..0f86fc7a1 100644 --- a/maxscale-system-test/bug673.cpp +++ b/maxscale-system-test/bug673.cpp @@ -8,8 +8,8 @@ * - Check that only new style object names in maxadmin commands are accepted */ -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug676.cpp b/maxscale-system-test/bug676.cpp index b4a2566d1..3b9d3f6f1 100644 --- a/maxscale-system-test/bug676.cpp +++ b/maxscale-system-test/bug676.cpp @@ -9,7 +9,7 @@ */ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug681.cpp b/maxscale-system-test/bug681.cpp index 470d5a593..c4b4e8113 100644 --- a/maxscale-system-test/bug681.cpp +++ b/maxscale-system-test/bug681.cpp @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug705.cpp b/maxscale-system-test/bug705.cpp index ad0435bfd..6ff95405b 100644 --- a/maxscale-system-test/bug705.cpp +++ b/maxscale-system-test/bug705.cpp @@ -273,8 +273,8 @@ #include -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug729.cpp b/maxscale-system-test/bug729.cpp index 079b2f753..2ccc9ae99 100644 --- a/maxscale-system-test/bug729.cpp +++ b/maxscale-system-test/bug729.cpp @@ -60,7 +60,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bug730.cpp b/maxscale-system-test/bug730.cpp index 636575e84..e612d2190 100644 --- a/maxscale-system-test/bug730.cpp +++ b/maxscale-system-test/bug730.cpp @@ -41,7 +41,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/bulk_insert.cpp b/maxscale-system-test/bulk_insert.cpp index b4a68f13e..b091fdbe9 100644 --- a/maxscale-system-test/bulk_insert.cpp +++ b/maxscale-system-test/bulk_insert.cpp @@ -5,7 +5,7 @@ * https://mariadb.com/kb/en/mariadb/bulk-insert-column-wise-binding/ */ -#include +#include static int show_mysql_error(MYSQL* mysql) { diff --git a/maxscale-system-test/cache_runtime.cpp b/maxscale-system-test/cache_runtime.cpp index 21f9fa9ee..3b93be903 100644 --- a/maxscale-system-test/cache_runtime.cpp +++ b/maxscale-system-test/cache_runtime.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/cache_runtime_ttl.cpp b/maxscale-system-test/cache_runtime_ttl.cpp index 85dae2354..c83741dfa 100644 --- a/maxscale-system-test/cache_runtime_ttl.cpp +++ b/maxscale-system-test/cache_runtime_ttl.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/ccrfilter.cpp b/maxscale-system-test/ccrfilter.cpp index c1635e5c7..4fedae917 100644 --- a/maxscale-system-test/ccrfilter.cpp +++ b/maxscale-system-test/ccrfilter.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include static int master_id; diff --git a/maxscale-system-test/ccrfilter_global.cpp b/maxscale-system-test/ccrfilter_global.cpp index 4f25871d0..66f165d28 100644 --- a/maxscale-system-test/ccrfilter_global.cpp +++ b/maxscale-system-test/ccrfilter_global.cpp @@ -2,7 +2,7 @@ * Test global mode for the CCRFilter */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/cdc_client.cpp b/maxscale-system-test/cdc_client.cpp index e88f7cd01..823154778 100644 --- a/maxscale-system-test/cdc_client.cpp +++ b/maxscale-system-test/cdc_client.cpp @@ -18,9 +18,9 @@ #include #include -#include -#include -#include +#include +#include +#include using namespace std; char reg_str[] = "REGISTER UUID=XXX-YYY_YYY, TYPE=JSON"; diff --git a/maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp b/maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp index d65b9eef5..e846e62c4 100644 --- a/maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp +++ b/maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp @@ -2,7 +2,7 @@ * @file cdc_connect.cpp Test the CDC protocol */ -#include +#include #include #include "cdc_result.h" #include diff --git a/maxscale-system-test/change_master_during_session.cpp b/maxscale-system-test/change_master_during_session.cpp index 8ef87bd86..83ec38b98 100644 --- a/maxscale-system-test/change_master_during_session.cpp +++ b/maxscale-system-test/change_master_during_session.cpp @@ -7,8 +7,8 @@ */ #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/change_user.cpp b/maxscale-system-test/change_user.cpp index 92d2e5ec3..72e4accb4 100644 --- a/maxscale-system-test/change_user.cpp +++ b/maxscale-system-test/change_user.cpp @@ -12,7 +12,7 @@ * - try INSERT again expecting success (user should not be changed) */ -#include +#include void run_test(TestConnections& test, MYSQL* conn) { diff --git a/maxscale-system-test/check_backend.cpp b/maxscale-system-test/check_backend.cpp index 217c83ad8..26ff2f541 100644 --- a/maxscale-system-test/check_backend.cpp +++ b/maxscale-system-test/check_backend.cpp @@ -4,7 +4,7 @@ #include -#include +#include int main(int argc, char *argv[]) { diff --git a/maxscale-system-test/clustrix_basics.cpp b/maxscale-system-test/clustrix_basics.cpp index fd811643a..e3e50fc96 100644 --- a/maxscale-system-test/clustrix_basics.cpp +++ b/maxscale-system-test/clustrix_basics.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/clustrix_distribution.cpp b/maxscale-system-test/clustrix_distribution.cpp index 5e33e0b1c..b53fbb7b6 100644 --- a/maxscale-system-test/clustrix_distribution.cpp +++ b/maxscale-system-test/clustrix_distribution.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/clustrix_mon.cpp b/maxscale-system-test/clustrix_mon.cpp index 319a9bc09..282905735 100644 --- a/maxscale-system-test/clustrix_mon.cpp +++ b/maxscale-system-test/clustrix_mon.cpp @@ -19,7 +19,7 @@ * See Clustrix_nodes.h for details about configiration */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/clustrix_transaction_replay.cpp b/maxscale-system-test/clustrix_transaction_replay.cpp index a0399266a..3f491bb62 100644 --- a/maxscale-system-test/clustrix_transaction_replay.cpp +++ b/maxscale-system-test/clustrix_transaction_replay.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/compound_statement.cpp b/maxscale-system-test/compound_statement.cpp index 2d81bf91e..5cf6b3f44 100644 --- a/maxscale-system-test/compound_statement.cpp +++ b/maxscale-system-test/compound_statement.cpp @@ -2,7 +2,7 @@ * Test 10.1 compound statements */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/config_test.cpp b/maxscale-system-test/config_test.cpp index d68bad59e..0c61218b0 100644 --- a/maxscale-system-test/config_test.cpp +++ b/maxscale-system-test/config_test.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include using std::string; diff --git a/maxscale-system-test/connect_to_nonexisting_db.cpp b/maxscale-system-test/connect_to_nonexisting_db.cpp index 0ba193e82..f783e4603 100644 --- a/maxscale-system-test/connect_to_nonexisting_db.cpp +++ b/maxscale-system-test/connect_to_nonexisting_db.cpp @@ -2,8 +2,8 @@ * @file connect_to_nonexisting_db.cpp Tries to connect to non existing DB, expects no crash */ -#include -#include +#include +#include bool try_connect(TestConnections& test) { diff --git a/maxscale-system-test/connection_limit.cpp b/maxscale-system-test/connection_limit.cpp index 0d6037e8e..342d02010 100644 --- a/maxscale-system-test/connection_limit.cpp +++ b/maxscale-system-test/connection_limit.cpp @@ -6,7 +6,7 @@ * - create max num of connections and check tha N+1 connection fails */ -#include +#include void check_with_wrong_pw(int router, int max_conn, TestConnections& test); void check_max_conn(int router, int max_conn, TestConnections& test); diff --git a/maxscale-system-test/crash_on_bad_sescmd.cpp b/maxscale-system-test/crash_on_bad_sescmd.cpp index 28f5933c2..1145a7cdb 100644 --- a/maxscale-system-test/crash_on_bad_sescmd.cpp +++ b/maxscale-system-test/crash_on_bad_sescmd.cpp @@ -2,7 +2,7 @@ * Double-close on bad session command result */ -#include +#include void run_test(TestConnections& test) { diff --git a/maxscale-system-test/crash_out_of_files.cpp b/maxscale-system-test/crash_out_of_files.cpp index 0729d4bd6..d15d75451 100644 --- a/maxscale-system-test/crash_out_of_files.cpp +++ b/maxscale-system-test/crash_out_of_files.cpp @@ -5,8 +5,8 @@ * - check that no backends are disconnected with error ""refresh rate limit exceeded" */ -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/create_rds.cpp b/maxscale-system-test/create_rds.cpp index 8f893726b..f5360cc73 100644 --- a/maxscale-system-test/create_rds.cpp +++ b/maxscale-system-test/create_rds.cpp @@ -5,7 +5,7 @@ */ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/csmon_test.cpp b/maxscale-system-test/csmon_test.cpp index a227644e5..cf9397c29 100644 --- a/maxscale-system-test/csmon_test.cpp +++ b/maxscale-system-test/csmon_test.cpp @@ -2,7 +2,7 @@ * MXS-2146: Test case for csmon */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/delete_rds.cpp b/maxscale-system-test/delete_rds.cpp index 1c1979abd..ec3b882a7 100644 --- a/maxscale-system-test/delete_rds.cpp +++ b/maxscale-system-test/delete_rds.cpp @@ -4,7 +4,7 @@ */ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/different_size_binlog.cpp b/maxscale-system-test/different_size_binlog.cpp index 90a9176d4..2001e892d 100644 --- a/maxscale-system-test/different_size_binlog.cpp +++ b/maxscale-system-test/different_size_binlog.cpp @@ -8,8 +8,8 @@ #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/different_size_rwsplit.cpp b/maxscale-system-test/different_size_rwsplit.cpp index 4d4333abd..89a4d36c1 100644 --- a/maxscale-system-test/different_size_rwsplit.cpp +++ b/maxscale-system-test/different_size_rwsplit.cpp @@ -7,8 +7,8 @@ #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/encrypted_passwords.cpp b/maxscale-system-test/encrypted_passwords.cpp index 48bdb15ae..bb201538f 100644 --- a/maxscale-system-test/encrypted_passwords.cpp +++ b/maxscale-system-test/encrypted_passwords.cpp @@ -4,7 +4,7 @@ */ #include -#include +#include /** Remove old keys and create a new one */ int create_key(TestConnections* test) diff --git a/maxscale-system-test/error_messages.cpp b/maxscale-system-test/error_messages.cpp index 38dccbc31..0a7f997d9 100644 --- a/maxscale-system-test/error_messages.cpp +++ b/maxscale-system-test/error_messages.cpp @@ -6,7 +6,7 @@ * - repeat for RWSplit, ReadConn */ -#include +#include #include #include diff --git a/maxscale-system-test/false_monitor_state_change.cpp b/maxscale-system-test/false_monitor_state_change.cpp index 75b9dd4d7..12948786d 100644 --- a/maxscale-system-test/false_monitor_state_change.cpp +++ b/maxscale-system-test/false_monitor_state_change.cpp @@ -2,7 +2,7 @@ * Test false server state changes when manually clearing master bit */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/fwf.cpp b/maxscale-system-test/fwf.cpp index 150b2d812..1b097945b 100644 --- a/maxscale-system-test/fwf.cpp +++ b/maxscale-system-test/fwf.cpp @@ -18,10 +18,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/fwf2.cpp b/maxscale-system-test/fwf2.cpp index 84f20b0f9..2d2e39acb 100644 --- a/maxscale-system-test/fwf2.cpp +++ b/maxscale-system-test/fwf2.cpp @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include int read_and_execute_queries(TestConnections* Test, const char* filename, int expected) { diff --git a/maxscale-system-test/fwf_actions.cpp b/maxscale-system-test/fwf_actions.cpp index 50395f252..66cf27951 100644 --- a/maxscale-system-test/fwf_actions.cpp +++ b/maxscale-system-test/fwf_actions.cpp @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/fwf_com_ping.cpp b/maxscale-system-test/fwf_com_ping.cpp index 5f27fd1ac..d908f71eb 100644 --- a/maxscale-system-test/fwf_com_ping.cpp +++ b/maxscale-system-test/fwf_com_ping.cpp @@ -4,8 +4,8 @@ * Check that COM_PING is allowed with `action=allow` */ -#include -#include +#include +#include const char* rules = "rule test1 deny regex '.*'\n" "users %@% match any rules test1\n"; diff --git a/maxscale-system-test/fwf_duplicate_rules.cpp b/maxscale-system-test/fwf_duplicate_rules.cpp index 84bff4810..869487047 100644 --- a/maxscale-system-test/fwf_duplicate_rules.cpp +++ b/maxscale-system-test/fwf_duplicate_rules.cpp @@ -4,8 +4,8 @@ * Check if duplicate rules are detected. */ -#include -#include +#include +#include const char* rules = "rule test1 deny no_where_clause\n" "rule test1 deny columns a b c\n" diff --git a/maxscale-system-test/fwf_logging.cpp b/maxscale-system-test/fwf_logging.cpp index 2de78b8bd..6e12374bc 100644 --- a/maxscale-system-test/fwf_logging.cpp +++ b/maxscale-system-test/fwf_logging.cpp @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/fwf_prepared_stmt.cpp b/maxscale-system-test/fwf_prepared_stmt.cpp index 6dc8e0f12..ed3efc4b8 100644 --- a/maxscale-system-test/fwf_prepared_stmt.cpp +++ b/maxscale-system-test/fwf_prepared_stmt.cpp @@ -5,8 +5,8 @@ * properly handled. */ -#include -#include +#include +#include const char* rules = "rule test1 deny columns c on_queries select\n" "users %@% match any rules test1\n"; diff --git a/maxscale-system-test/fwf_reload.cpp b/maxscale-system-test/fwf_reload.cpp index be14f8fea..ce82f0279 100644 --- a/maxscale-system-test/fwf_reload.cpp +++ b/maxscale-system-test/fwf_reload.cpp @@ -5,10 +5,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/fwf_strict.cpp b/maxscale-system-test/fwf_strict.cpp index 586c37258..a34b6c926 100644 --- a/maxscale-system-test/fwf_strict.cpp +++ b/maxscale-system-test/fwf_strict.cpp @@ -4,8 +4,8 @@ * Check that COM_PING is allowed with `action=allow` */ -#include -#include +#include +#include #include diff --git a/maxscale-system-test/fwf_syntax.cpp b/maxscale-system-test/fwf_syntax.cpp index 04b160ad8..9e799c0bb 100644 --- a/maxscale-system-test/fwf_syntax.cpp +++ b/maxscale-system-test/fwf_syntax.cpp @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include const char* temp_rules = "rules_tmp.txt"; diff --git a/maxscale-system-test/galera_priority.cpp b/maxscale-system-test/galera_priority.cpp index 653319750..02213d4eb 100644 --- a/maxscale-system-test/galera_priority.cpp +++ b/maxscale-system-test/galera_priority.cpp @@ -13,7 +13,7 @@ #include -#include +#include using namespace std; diff --git a/maxscale-system-test/kerberos_setup.cpp b/maxscale-system-test/kerberos_setup.cpp index 8e6d8feb6..416d63882 100644 --- a/maxscale-system-test/kerberos_setup.cpp +++ b/maxscale-system-test/kerberos_setup.cpp @@ -7,7 +7,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/kill_master.cpp b/maxscale-system-test/kill_master.cpp index 12c07dd1f..4c5bceda4 100644 --- a/maxscale-system-test/kill_master.cpp +++ b/maxscale-system-test/kill_master.cpp @@ -9,7 +9,7 @@ */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/kill_query.cpp b/maxscale-system-test/kill_query.cpp index 280288ac6..9b78482b5 100644 --- a/maxscale-system-test/kill_query.cpp +++ b/maxscale-system-test/kill_query.cpp @@ -2,7 +2,7 @@ * Test KILL QUERY functionality */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/load_balancing.cpp b/maxscale-system-test/load_balancing.cpp index 752464ffa..f8bba7047 100644 --- a/maxscale-system-test/load_balancing.cpp +++ b/maxscale-system-test/load_balancing.cpp @@ -14,8 +14,8 @@ * more then 10% of quesries went to Master */ -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/local_address.cpp b/maxscale-system-test/local_address.cpp index 73a53ba3a..40b450ff6 100644 --- a/maxscale-system-test/local_address.cpp +++ b/maxscale-system-test/local_address.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include #include #include diff --git a/maxscale-system-test/long_sysbench.cpp b/maxscale-system-test/long_sysbench.cpp index 76ee5ff88..3bad79473 100644 --- a/maxscale-system-test/long_sysbench.cpp +++ b/maxscale-system-test/long_sysbench.cpp @@ -8,7 +8,7 @@ */ -#include +#include #include "sysbench_commands.h" int main(int argc, char* argv[]) diff --git a/maxscale-system-test/long_test.cpp b/maxscale-system-test/long_test.cpp index 9f2b8272b..0a8153633 100644 --- a/maxscale-system-test/long_test.cpp +++ b/maxscale-system-test/long_test.cpp @@ -6,8 +6,8 @@ */ -#include -#include +#include +#include typedef void * FUNC(void * ptr); diff --git a/maxscale-system-test/longblob.cpp b/maxscale-system-test/longblob.cpp index 64d01379b..f0cb37c9f 100644 --- a/maxscale-system-test/longblob.cpp +++ b/maxscale-system-test/longblob.cpp @@ -3,8 +3,8 @@ * - try to insert large BLOB, MEDIUMBLOB and LONGBLOB via RWSplit, ReadConn Master and directly to backend */ -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/lots_of_rows.cpp b/maxscale-system-test/lots_of_rows.cpp index 46914b4d6..b9f278d23 100644 --- a/maxscale-system-test/lots_of_rows.cpp +++ b/maxscale-system-test/lots_of_rows.cpp @@ -6,8 +6,8 @@ #include -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mariadbmonitor/fail_switch_rejoin_common.cpp b/maxscale-system-test/mariadbmonitor/fail_switch_rejoin_common.cpp index 1157dce3b..10373fb5a 100644 --- a/maxscale-system-test/mariadbmonitor/fail_switch_rejoin_common.cpp +++ b/maxscale-system-test/mariadbmonitor/fail_switch_rejoin_common.cpp @@ -1,4 +1,4 @@ -#include +#include int inserts = 0; bool interactive = false; diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp index 8db72098c..fb4523f21 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "fail_switch_rejoin_common.cpp" using std::stringstream; diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp index ac8628bae..05a821a3c 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include #include diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp index 52d83a1a6..d5a7feacd 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp @@ -1,7 +1,7 @@ /** * Test monitoring and failover with ignore_external_masters=true */ -#include +#include #include "fail_switch_rejoin_common.cpp" #include #include diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp index 11cb9b702..c68b1bee1 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include "failover_common.cpp" #include diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp index e9fcb481a..ee4af1374 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include "fail_switch_rejoin_common.cpp" #include #include diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_auto.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_auto.cpp index 5978ae0e2..4d9112180 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_auto.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_auto.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include "failover_common.cpp" int main(int argc, char** argv) diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp index 526020b26..a58105a30 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include "failover_common.cpp" int main(int argc, char** argv) diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp index edc860e2b..4ece9a3cb 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp index aa4e26e2b..ec483a245 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp @@ -13,7 +13,7 @@ // MXS-2652: https://jira.mariadb.org/browse/MXS-2652 -#include +#include #include "fail_switch_rejoin_common.cpp" using std::string; diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp index 816b74679..c7e520a15 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include "fail_switch_rejoin_common.cpp" #include #include diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp index 5374da26c..9911fcb6e 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include using std::cerr; using std::cout; diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp index e7bc87a9c..c31af6cdc 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include using std::cerr; using std::cout; diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp index 603350697..e890b7bbd 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include using std::cerr; using std::cout; diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp index ed144b49b..f961379f3 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "fail_switch_rejoin_common.cpp" using namespace std; diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp index a1a97501e..9ddd813e2 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp @@ -21,9 +21,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp index a0436fa84..84a6db9f1 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include "fail_switch_rejoin_common.cpp" using std::string; diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp index 77002e025..af2a2ca02 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include "fail_switch_rejoin_common.cpp" using std::string; diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp index fb4dd43aa..7c2c48cae 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp @@ -13,7 +13,7 @@ #include -#include +#include #include "fail_switch_rejoin_common.cpp" #include diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp index b078bfdc4..a3b11b820 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include "fail_switch_rejoin_common.cpp" #include #include diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp index 683826078..03ebdc44c 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include using std::cerr; using std::cout; diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp index febca154b..08c39ec65 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include "fail_switch_rejoin_common.cpp" #include #include diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp index 83fa74150..e6e0ea917 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include using std::cerr; using std::cout; diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp index 50fcf891f..9ab7a8699 100644 --- a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp +++ b/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "fail_switch_rejoin_common.cpp" using namespace std; diff --git a/maxscale-system-test/mariadbmonitor/verify_master_failure.cpp b/maxscale-system-test/mariadbmonitor/verify_master_failure.cpp index 78d5641c4..c3a061702 100644 --- a/maxscale-system-test/mariadbmonitor/verify_master_failure.cpp +++ b/maxscale-system-test/mariadbmonitor/verify_master_failure.cpp @@ -4,7 +4,7 @@ * Testing of master failure verification */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/masking_auto_firewall.cpp b/maxscale-system-test/masking_auto_firewall.cpp index f29c5740d..c889679c3 100644 --- a/maxscale-system-test/masking_auto_firewall.cpp +++ b/maxscale-system-test/masking_auto_firewall.cpp @@ -12,7 +12,7 @@ */ #include -#include +#include using namespace std; diff --git a/maxscale-system-test/max_connections.cpp b/maxscale-system-test/max_connections.cpp index 873ca37f8..309d12b4d 100644 --- a/maxscale-system-test/max_connections.cpp +++ b/maxscale-system-test/max_connections.cpp @@ -7,7 +7,7 @@ * - close all connections */ -#include +#include #define CONNECTIONS 21 #define ITER 25 diff --git a/maxscale-system-test/maxctrl_basic.cpp b/maxscale-system-test/maxctrl_basic.cpp index db86a1408..29b9e286b 100644 --- a/maxscale-system-test/maxctrl_basic.cpp +++ b/maxscale-system-test/maxctrl_basic.cpp @@ -2,7 +2,7 @@ * Minimal MaxCtrl sanity check */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/maxinfo_sql.cpp b/maxscale-system-test/maxinfo_sql.cpp index a63799f8a..e9ea15346 100644 --- a/maxscale-system-test/maxinfo_sql.cpp +++ b/maxscale-system-test/maxinfo_sql.cpp @@ -2,7 +2,7 @@ * Test MaxInfo with the SQL interface */ -#include +#include #include #include #include diff --git a/maxscale-system-test/maxscale_process_user.cpp b/maxscale-system-test/maxscale_process_user.cpp index 18f78d725..ad70f413d 100644 --- a/maxscale-system-test/maxscale_process_user.cpp +++ b/maxscale-system-test/maxscale_process_user.cpp @@ -2,7 +2,7 @@ * Check if Maxscale priocess is running as 'maxscale' */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/maxtest/include/maxtest/big_load.h b/maxscale-system-test/maxtest/include/maxtest/big_load.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/big_load.h rename to maxscale-system-test/maxtest/include/maxtest/big_load.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/blob_test.h b/maxscale-system-test/maxtest/include/maxtest/blob_test.hh similarity index 97% rename from maxscale-system-test/maxtest/include/maxtest/blob_test.h rename to maxscale-system-test/maxtest/include/maxtest/blob_test.hh index b5d724130..11e85db05 100644 --- a/maxscale-system-test/maxtest/include/maxtest/blob_test.h +++ b/maxscale-system-test/maxtest/include/maxtest/blob_test.hh @@ -1,6 +1,6 @@ #pragma once -#include +#include /** * @brief test_longblob INSERT big amount of data into lobg_blob_table diff --git a/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h b/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.hh similarity index 98% rename from maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h rename to maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.hh index 4c8d2a32b..9c60b68a7 100644 --- a/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h +++ b/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.hh @@ -23,7 +23,7 @@ #include #include -#include +#include #include #define CLUSTRIX_DEPS_YUM "yum install -y bzip2 wget screen ntp ntpdate vim htop mdadm" diff --git a/maxscale-system-test/maxtest/include/maxtest/config_operations.h b/maxscale-system-test/maxtest/include/maxtest/config_operations.hh similarity index 98% rename from maxscale-system-test/maxtest/include/maxtest/config_operations.h rename to maxscale-system-test/maxtest/include/maxtest/config_operations.hh index 490e16fdc..593336b10 100644 --- a/maxscale-system-test/maxtest/include/maxtest/config_operations.h +++ b/maxscale-system-test/maxtest/include/maxtest/config_operations.hh @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/maxscale-system-test/maxtest/include/maxtest/different_size.h b/maxscale-system-test/maxtest/include/maxtest/different_size.hh similarity index 96% rename from maxscale-system-test/maxtest/include/maxtest/different_size.h rename to maxscale-system-test/maxtest/include/maxtest/different_size.hh index 5e86bffc2..b4915108a 100644 --- a/maxscale-system-test/maxtest/include/maxtest/different_size.h +++ b/maxscale-system-test/maxtest/include/maxtest/different_size.hh @@ -1,6 +1,6 @@ #pragma once -#include +#include /** * @brief create_event_size Creates SQL query to generate even of given size diff --git a/maxscale-system-test/maxtest/include/maxtest/fw_copy_rules.h b/maxscale-system-test/maxtest/include/maxtest/fw_copy_rules.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/fw_copy_rules.h rename to maxscale-system-test/maxtest/include/maxtest/fw_copy_rules.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/get_com_select_insert.h b/maxscale-system-test/maxtest/include/maxtest/get_com_select_insert.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/get_com_select_insert.h rename to maxscale-system-test/maxtest/include/maxtest/get_com_select_insert.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/get_my_ip.h b/maxscale-system-test/maxtest/include/maxtest/get_my_ip.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/get_my_ip.h rename to maxscale-system-test/maxtest/include/maxtest/get_my_ip.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/keepalived_func.h b/maxscale-system-test/maxtest/include/maxtest/keepalived_func.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/keepalived_func.h rename to maxscale-system-test/maxtest/include/maxtest/keepalived_func.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/mariadb_func.h b/maxscale-system-test/maxtest/include/maxtest/mariadb_func.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/mariadb_func.h rename to maxscale-system-test/maxtest/include/maxtest/mariadb_func.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h b/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.hh similarity index 99% rename from maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h rename to maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.hh index 892aff16a..a70906ae4 100644 --- a/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h +++ b/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.hh @@ -14,7 +14,7 @@ #include #include -#include +#include #include /** diff --git a/maxscale-system-test/maxtest/include/maxtest/maxadmin_operations.h b/maxscale-system-test/maxtest/include/maxtest/maxadmin_operations.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/maxadmin_operations.h rename to maxscale-system-test/maxtest/include/maxtest/maxadmin_operations.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/maxinfo_func.h b/maxscale-system-test/maxtest/include/maxtest/maxinfo_func.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/maxinfo_func.h rename to maxscale-system-test/maxtest/include/maxtest/maxinfo_func.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/maxrest.hh b/maxscale-system-test/maxtest/include/maxtest/maxrest.hh index 4598804fe..866721da4 100644 --- a/maxscale-system-test/maxtest/include/maxtest/maxrest.hh +++ b/maxscale-system-test/maxtest/include/maxtest/maxrest.hh @@ -12,7 +12,7 @@ */ #pragma once -#include +#include #include /** diff --git a/maxscale-system-test/maxtest/include/maxtest/maxscales.hh b/maxscale-system-test/maxtest/include/maxtest/maxscales.hh index a5dcf5554..016ebc7ff 100644 --- a/maxscale-system-test/maxtest/include/maxtest/maxscales.hh +++ b/maxscale-system-test/maxtest/include/maxtest/maxscales.hh @@ -1,8 +1,8 @@ #pragma once #include -#include -#include +#include +#include #include class Maxscales: public Nodes diff --git a/maxscale-system-test/maxtest/include/maxtest/nodes.hh b/maxscale-system-test/maxtest/include/maxtest/nodes.hh index 14f5fd2f2..4300df29a 100644 --- a/maxscale-system-test/maxtest/include/maxtest/nodes.hh +++ b/maxscale-system-test/maxtest/include/maxtest/nodes.hh @@ -6,7 +6,7 @@ #include #include -#include +#include typedef std::set StringSet; diff --git a/maxscale-system-test/maxtest/include/maxtest/rds_vpc.h b/maxscale-system-test/maxtest/include/maxtest/rds_vpc.hh similarity index 99% rename from maxscale-system-test/maxtest/include/maxtest/rds_vpc.h rename to maxscale-system-test/maxtest/include/maxtest/rds_vpc.hh index a31d421fb..c93e47d97 100644 --- a/maxscale-system-test/maxtest/include/maxtest/rds_vpc.h +++ b/maxscale-system-test/maxtest/include/maxtest/rds_vpc.hh @@ -3,7 +3,7 @@ #include #include #include -#include +#include class RDS { diff --git a/maxscale-system-test/maxtest/include/maxtest/sql_t1.h b/maxscale-system-test/maxtest/include/maxtest/sql_t1.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/sql_t1.h rename to maxscale-system-test/maxtest/include/maxtest/sql_t1.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/test_binlog_fnc.h b/maxscale-system-test/maxtest/include/maxtest/test_binlog_fnc.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/test_binlog_fnc.h rename to maxscale-system-test/maxtest/include/maxtest/test_binlog_fnc.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/testconnections.h b/maxscale-system-test/maxtest/include/maxtest/testconnections.hh similarity index 99% rename from maxscale-system-test/maxtest/include/maxtest/testconnections.h rename to maxscale-system-test/maxtest/include/maxtest/testconnections.hh index c00f5dee2..52a8edc6d 100644 --- a/maxscale-system-test/maxtest/include/maxtest/testconnections.h +++ b/maxscale-system-test/maxtest/include/maxtest/testconnections.hh @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/maxscale-system-test/maxtest/src/big_load.cc b/maxscale-system-test/maxtest/src/big_load.cc index f18ac582c..27fe0d734 100644 --- a/maxscale-system-test/maxtest/src/big_load.cc +++ b/maxscale-system-test/maxtest/src/big_load.cc @@ -1,9 +1,9 @@ -#include +#include #include -#include -#include -#include +#include +#include +#include void load(long int* new_inserts, diff --git a/maxscale-system-test/maxtest/src/blob_test.cc b/maxscale-system-test/maxtest/src/blob_test.cc index e6faa0749..e4c5188af 100644 --- a/maxscale-system-test/maxtest/src/blob_test.cc +++ b/maxscale-system-test/maxtest/src/blob_test.cc @@ -1,4 +1,4 @@ -#include +#include int test_longblob(TestConnections* Test, MYSQL* conn, diff --git a/maxscale-system-test/maxtest/src/clustrix_nodes.cpp b/maxscale-system-test/maxtest/src/clustrix_nodes.cpp index de6fe6bb8..bb2c0b472 100644 --- a/maxscale-system-test/maxtest/src/clustrix_nodes.cpp +++ b/maxscale-system-test/maxtest/src/clustrix_nodes.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include int Clustrix_nodes::prepare_server(int m) { diff --git a/maxscale-system-test/maxtest/src/config_operations.cc b/maxscale-system-test/maxtest/src/config_operations.cc index adb93e03d..adad91294 100644 --- a/maxscale-system-test/maxtest/src/config_operations.cc +++ b/maxscale-system-test/maxtest/src/config_operations.cc @@ -1,4 +1,4 @@ -#include +#include // The configuration should use these names for the services, listeners and monitors #define SERVICE_NAME1 "rwsplit-service" diff --git a/maxscale-system-test/maxtest/src/different_size.cc b/maxscale-system-test/maxtest/src/different_size.cc index 773147fef..154435821 100644 --- a/maxscale-system-test/maxtest/src/different_size.cc +++ b/maxscale-system-test/maxtest/src/different_size.cc @@ -1,6 +1,6 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/maxtest/src/fw_copy_rules.cc b/maxscale-system-test/maxtest/src/fw_copy_rules.cc index f19b9de98..afdfb2c62 100644 --- a/maxscale-system-test/maxtest/src/fw_copy_rules.cc +++ b/maxscale-system-test/maxtest/src/fw_copy_rules.cc @@ -1,6 +1,6 @@ -#include +#include #include -#include +#include void copy_rules(TestConnections* Test, const char* rules_name, const char* rules_dir) { diff --git a/maxscale-system-test/maxtest/src/get_com_select_insert.cc b/maxscale-system-test/maxtest/src/get_com_select_insert.cc index de5d10ee7..896a73981 100644 --- a/maxscale-system-test/maxtest/src/get_com_select_insert.cc +++ b/maxscale-system-test/maxtest/src/get_com_select_insert.cc @@ -1,4 +1,4 @@ -#include +#include /** * Reads COM_SELECT and COM_INSERT variables from all nodes and stores into 'selects' and 'inserts' diff --git a/maxscale-system-test/maxtest/src/get_my_ip.cc b/maxscale-system-test/maxtest/src/get_my_ip.cc index db0a0365d..996811b1a 100644 --- a/maxscale-system-test/maxtest/src/get_my_ip.cc +++ b/maxscale-system-test/maxtest/src/get_my_ip.cc @@ -3,7 +3,7 @@ * Use getsockname and a udp connection */ -#include +#include #include // printf #include // memset diff --git a/maxscale-system-test/maxtest/src/keepalived_func.cc b/maxscale-system-test/maxtest/src/keepalived_func.cc index 7967c4cbf..6ad59b47d 100644 --- a/maxscale-system-test/maxtest/src/keepalived_func.cc +++ b/maxscale-system-test/maxtest/src/keepalived_func.cc @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include char* print_version_string(TestConnections* Test) { diff --git a/maxscale-system-test/maxtest/src/mariadb_func.cc b/maxscale-system-test/maxtest/src/mariadb_func.cc index 665951021..5fe57380b 100644 --- a/maxscale-system-test/maxtest/src/mariadb_func.cc +++ b/maxscale-system-test/maxtest/src/mariadb_func.cc @@ -11,7 +11,7 @@ */ -#include +#include #include #include #include diff --git a/maxscale-system-test/maxtest/src/mariadb_nodes.cc b/maxscale-system-test/maxtest/src/mariadb_nodes.cc index 9da659bc7..2ce4d396c 100644 --- a/maxscale-system-test/maxtest/src/mariadb_nodes.cc +++ b/maxscale-system-test/maxtest/src/mariadb_nodes.cc @@ -10,7 +10,7 @@ * @endverbatim */ -#include +#include #include #include #include diff --git a/maxscale-system-test/maxtest/src/maxadmin_operations.cc b/maxscale-system-test/maxtest/src/maxadmin_operations.cc index 334f1d698..a4998e46b 100644 --- a/maxscale-system-test/maxtest/src/maxadmin_operations.cc +++ b/maxscale-system-test/maxtest/src/maxadmin_operations.cc @@ -16,7 +16,7 @@ * Copyright MariaDB Corporation Ab 2014 */ -#include +#include int connectMaxScale(char* hostname, char* port) { diff --git a/maxscale-system-test/maxtest/src/maxinfo_func.cc b/maxscale-system-test/maxtest/src/maxinfo_func.cc index 0304879b1..4b535374a 100644 --- a/maxscale-system-test/maxtest/src/maxinfo_func.cc +++ b/maxscale-system-test/maxtest/src/maxinfo_func.cc @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -11,7 +11,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/maxtest/src/rds_vpc.cc b/maxscale-system-test/maxtest/src/rds_vpc.cc index 2cc4d8bde..d15ae16f1 100644 --- a/maxscale-system-test/maxtest/src/rds_vpc.cc +++ b/maxscale-system-test/maxtest/src/rds_vpc.cc @@ -1,4 +1,4 @@ -#include +#include #include RDS::RDS(char* cluster) diff --git a/maxscale-system-test/maxtest/src/sql_t1.cc b/maxscale-system-test/maxtest/src/sql_t1.cc index 3aace0689..4ca0703fb 100644 --- a/maxscale-system-test/maxtest/src/sql_t1.cc +++ b/maxscale-system-test/maxtest/src/sql_t1.cc @@ -1,8 +1,8 @@ -#include +#include #include #include -#include +#include pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; static char** sql = NULL; diff --git a/maxscale-system-test/maxtest/src/test_binlog_fnc.cc b/maxscale-system-test/maxtest/src/test_binlog_fnc.cc index 746ff532c..4b93ff4c4 100644 --- a/maxscale-system-test/maxtest/src/test_binlog_fnc.cc +++ b/maxscale-system-test/maxtest/src/test_binlog_fnc.cc @@ -1,8 +1,8 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include int check_sha1(TestConnections* Test) { diff --git a/maxscale-system-test/maxtest/src/testconnections.cc b/maxscale-system-test/maxtest/src/testconnections.cc index 1df01dc04..f96004103 100644 --- a/maxscale-system-test/maxtest/src/testconnections.cc +++ b/maxscale-system-test/maxtest/src/testconnections.cc @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/maxscale-system-test/mm.cpp b/maxscale-system-test/mm.cpp index 9ecee4102..cc55c1e2c 100644 --- a/maxscale-system-test/mm.cpp +++ b/maxscale-system-test/mm.cpp @@ -22,9 +22,9 @@ #include -#include -#include -#include +#include +#include +#include int check_conf(TestConnections& test, int blocked_node) { diff --git a/maxscale-system-test/mxs1045.cpp b/maxscale-system-test/mxs1045.cpp index 520419b3b..b9ba1f038 100644 --- a/maxscale-system-test/mxs1045.cpp +++ b/maxscale-system-test/mxs1045.cpp @@ -11,7 +11,7 @@ * - Check that script execution doesn't leave zombie processes */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs1071_maxrows.cpp b/maxscale-system-test/mxs1071_maxrows.cpp index c5e97a625..47d6a870b 100644 --- a/maxscale-system-test/mxs1071_maxrows.cpp +++ b/maxscale-system-test/mxs1071_maxrows.cpp @@ -43,10 +43,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace std; diff --git a/maxscale-system-test/mxs1110_16mb.cpp b/maxscale-system-test/mxs1110_16mb.cpp index 5f3cab194..7d2072642 100644 --- a/maxscale-system-test/mxs1110_16mb.cpp +++ b/maxscale-system-test/mxs1110_16mb.cpp @@ -4,9 +4,9 @@ * - read data via RWsplit, ReadConn master, ReadConn slave, compare with inserted data */ -#include -#include -#include +#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs1113_schemarouter_ps.cpp b/maxscale-system-test/mxs1113_schemarouter_ps.cpp index 0b7c3747a..7a57e1c87 100644 --- a/maxscale-system-test/mxs1113_schemarouter_ps.cpp +++ b/maxscale-system-test/mxs1113_schemarouter_ps.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1113 */ -#include +#include void test_text_protocol(TestConnections& test, MYSQL* conn) diff --git a/maxscale-system-test/mxs1123.cpp b/maxscale-system-test/mxs1123.cpp index 8ca0a3740..5c732a02a 100644 --- a/maxscale-system-test/mxs1123.cpp +++ b/maxscale-system-test/mxs1123.cpp @@ -2,7 +2,7 @@ * MXS-1123: connect_timeout setting causes frequent disconnects */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs118.cpp b/maxscale-system-test/mxs118.cpp index 8b29e7517..ede4eb5d0 100644 --- a/maxscale-system-test/mxs118.cpp +++ b/maxscale-system-test/mxs118.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs1295_sp_call.cpp b/maxscale-system-test/mxs1295_sp_call.cpp index 1d3f39095..967c2aaad 100644 --- a/maxscale-system-test/mxs1295_sp_call.cpp +++ b/maxscale-system-test/mxs1295_sp_call.cpp @@ -1,7 +1,7 @@ /** * Test for MXS-1295: https://jira.mariadb.org/browse/MXS-1295 */ -#include +#include const char sp_sql[] = "DROP PROCEDURE IF EXISTS multi;" diff --git a/maxscale-system-test/mxs1310_implicit_db.cpp b/maxscale-system-test/mxs1310_implicit_db.cpp index bff727716..10843b56e 100644 --- a/maxscale-system-test/mxs1310_implicit_db.cpp +++ b/maxscale-system-test/mxs1310_implicit_db.cpp @@ -5,7 +5,7 @@ * - Mix of explicit and implicit databases -> shard containing current database */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs1319.cpp b/maxscale-system-test/mxs1319.cpp index da4083189..67680f86e 100644 --- a/maxscale-system-test/mxs1319.cpp +++ b/maxscale-system-test/mxs1319.cpp @@ -2,7 +2,7 @@ * Check that SQL_MODE='PAD_CHAR_TO_FULL_LENGTH' doesn't break authentication */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs1323_retry_read.cpp b/maxscale-system-test/mxs1323_retry_read.cpp index f284eec28..8b8434b02 100644 --- a/maxscale-system-test/mxs1323_retry_read.cpp +++ b/maxscale-system-test/mxs1323_retry_read.cpp @@ -3,7 +3,7 @@ * - Check that retried reads work with persistent connections */ -#include +#include void* async_block(void* data) { diff --git a/maxscale-system-test/mxs1323_stress.cpp b/maxscale-system-test/mxs1323_stress.cpp index 28af6d606..c6ea54116 100644 --- a/maxscale-system-test/mxs1323_stress.cpp +++ b/maxscale-system-test/mxs1323_stress.cpp @@ -3,7 +3,7 @@ * - Check that retried reads work with persistent connections */ -#include +#include #include static bool running = true; diff --git a/maxscale-system-test/mxs1418.cpp b/maxscale-system-test/mxs1418.cpp index 921a1abaa..6baf5c231 100644 --- a/maxscale-system-test/mxs1418.cpp +++ b/maxscale-system-test/mxs1418.cpp @@ -2,7 +2,7 @@ * @file Check that removing a server from a service doesn't break active connections */ -#include +#include static volatile bool running = true; diff --git a/maxscale-system-test/mxs1451_skip_auth.cpp b/maxscale-system-test/mxs1451_skip_auth.cpp index b3c226ae5..2045c4f7f 100644 --- a/maxscale-system-test/mxs1451_skip_auth.cpp +++ b/maxscale-system-test/mxs1451_skip_auth.cpp @@ -4,7 +4,7 @@ * Check that connection through MaxScale work even if authentication is disabled */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs1457_ignore_deleted.cpp b/maxscale-system-test/mxs1457_ignore_deleted.cpp index 89d619599..b1306e238 100644 --- a/maxscale-system-test/mxs1457_ignore_deleted.cpp +++ b/maxscale-system-test/mxs1457_ignore_deleted.cpp @@ -4,7 +4,7 @@ * Check that a corrupt and deleted server is not used to load users */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs1468.cpp b/maxscale-system-test/mxs1468.cpp index b1ba5854d..9a120d7fc 100644 --- a/maxscale-system-test/mxs1468.cpp +++ b/maxscale-system-test/mxs1468.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1468 */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1476.cpp b/maxscale-system-test/mxs1476.cpp index 6a576de7c..87d41420c 100644 --- a/maxscale-system-test/mxs1476.cpp +++ b/maxscale-system-test/mxs1476.cpp @@ -5,7 +5,7 @@ * https://jira.mariadb.org/browse/MXS-1476 */ -#include +#include void list_servers(TestConnections& test) { diff --git a/maxscale-system-test/mxs1503_extra_slaves.cpp b/maxscale-system-test/mxs1503_extra_slaves.cpp index fa4967e92..f40cc2709 100644 --- a/maxscale-system-test/mxs1503_extra_slaves.cpp +++ b/maxscale-system-test/mxs1503_extra_slaves.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1503 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1503_master_reconnection.cpp b/maxscale-system-test/mxs1503_master_reconnection.cpp index f296ddf3f..3a27495cd 100644 --- a/maxscale-system-test/mxs1503_master_reconnection.cpp +++ b/maxscale-system-test/mxs1503_master_reconnection.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1503 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1503_queued_sescmd.cpp b/maxscale-system-test/mxs1503_queued_sescmd.cpp index 8cd89ddfa..e3d1c8ef5 100644 --- a/maxscale-system-test/mxs1503_queued_sescmd.cpp +++ b/maxscale-system-test/mxs1503_queued_sescmd.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1503 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1506_delayed_retry.cpp b/maxscale-system-test/mxs1506_delayed_retry.cpp index c43f81d02..390235a30 100644 --- a/maxscale-system-test/mxs1506_delayed_retry.cpp +++ b/maxscale-system-test/mxs1506_delayed_retry.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1506 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1506_no_master.cpp b/maxscale-system-test/mxs1506_no_master.cpp index d8b2fec07..2c99aa6cc 100644 --- a/maxscale-system-test/mxs1506_no_master.cpp +++ b/maxscale-system-test/mxs1506_no_master.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1506 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1507_inconsistent_trx.cpp b/maxscale-system-test/mxs1507_inconsistent_trx.cpp index 81e2044dd..6891c995a 100644 --- a/maxscale-system-test/mxs1507_inconsistent_trx.cpp +++ b/maxscale-system-test/mxs1507_inconsistent_trx.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1507 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1507_migrate_trx.cpp b/maxscale-system-test/mxs1507_migrate_trx.cpp index 3add93b67..5b41bdcb7 100644 --- a/maxscale-system-test/mxs1507_migrate_trx.cpp +++ b/maxscale-system-test/mxs1507_migrate_trx.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1507 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1507_trx_replay.cpp b/maxscale-system-test/mxs1507_trx_replay.cpp index 013bc5f7f..20ef5dffc 100644 --- a/maxscale-system-test/mxs1507_trx_replay.cpp +++ b/maxscale-system-test/mxs1507_trx_replay.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1507 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1507_trx_stress.cpp b/maxscale-system-test/mxs1507_trx_stress.cpp index 120f11fbf..879ae0067 100644 --- a/maxscale-system-test/mxs1507_trx_stress.cpp +++ b/maxscale-system-test/mxs1507_trx_stress.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1507 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1509.cpp b/maxscale-system-test/mxs1509.cpp index 580dd0df9..d9d2ff039 100644 --- a/maxscale-system-test/mxs1509.cpp +++ b/maxscale-system-test/mxs1509.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1509 */ -#include +#include #include void change_master(TestConnections& test, int slave, int master, const char* name = NULL) diff --git a/maxscale-system-test/mxs1516.cpp b/maxscale-system-test/mxs1516.cpp index 1929d26fd..cc100b21a 100644 --- a/maxscale-system-test/mxs1516.cpp +++ b/maxscale-system-test/mxs1516.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1516 */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1542.cpp b/maxscale-system-test/mxs1542.cpp index 05b2868bf..a741e3527 100644 --- a/maxscale-system-test/mxs1542.cpp +++ b/maxscale-system-test/mxs1542.cpp @@ -4,7 +4,7 @@ * Check that UTF16 strings work. */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1543.cpp b/maxscale-system-test/mxs1543.cpp index de882138c..3341599a2 100644 --- a/maxscale-system-test/mxs1543.cpp +++ b/maxscale-system-test/mxs1543.cpp @@ -4,7 +4,7 @@ * Avrorouter doesn't detect MIXED or STATEMENT format replication */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1549_optimistic_trx.cpp b/maxscale-system-test/mxs1549_optimistic_trx.cpp index a3f296ae8..c8b33ece5 100644 --- a/maxscale-system-test/mxs1549_optimistic_trx.cpp +++ b/maxscale-system-test/mxs1549_optimistic_trx.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1549 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1583_fwf.cpp b/maxscale-system-test/mxs1583_fwf.cpp index c7c373fa9..9365a5dc4 100644 --- a/maxscale-system-test/mxs1583_fwf.cpp +++ b/maxscale-system-test/mxs1583_fwf.cpp @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1585.cpp b/maxscale-system-test/mxs1585.cpp index 9f6121750..5c7703fe4 100644 --- a/maxscale-system-test/mxs1585.cpp +++ b/maxscale-system-test/mxs1585.cpp @@ -5,7 +5,7 @@ * mode when master_failure_mode is fail_on_write. */ -#include +#include #include static bool running = true; diff --git a/maxscale-system-test/mxs1628_bad_handshake.cpp b/maxscale-system-test/mxs1628_bad_handshake.cpp index d175321cf..d1128f865 100644 --- a/maxscale-system-test/mxs1628_bad_handshake.cpp +++ b/maxscale-system-test/mxs1628_bad_handshake.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include int main(int argc, char* argv[]) diff --git a/maxscale-system-test/mxs1643_extra_events.cpp b/maxscale-system-test/mxs1643_extra_events.cpp index c0128ac53..1c7ef5cb4 100644 --- a/maxscale-system-test/mxs1643_extra_events.cpp +++ b/maxscale-system-test/mxs1643_extra_events.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1643 */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1653_ps_hang.cpp b/maxscale-system-test/mxs1653_ps_hang.cpp index 1b3782407..8296949cf 100644 --- a/maxscale-system-test/mxs1653_ps_hang.cpp +++ b/maxscale-system-test/mxs1653_ps_hang.cpp @@ -1,4 +1,4 @@ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1662_pam_admin.cpp b/maxscale-system-test/mxs1662_pam_admin.cpp index 25a835440..c6f9f8101 100644 --- a/maxscale-system-test/mxs1662_pam_admin.cpp +++ b/maxscale-system-test/mxs1662_pam_admin.cpp @@ -2,7 +2,7 @@ * MXS-1662: PAM authenticator for admin users */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1677_temp_table.cpp b/maxscale-system-test/mxs1677_temp_table.cpp index 60d47a537..977ad9cc0 100644 --- a/maxscale-system-test/mxs1677_temp_table.cpp +++ b/maxscale-system-test/mxs1677_temp_table.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1677 */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1678_relay_master.cpp b/maxscale-system-test/mxs1678_relay_master.cpp index aa23d5bb9..67c74dc7d 100644 --- a/maxscale-system-test/mxs1678_relay_master.cpp +++ b/maxscale-system-test/mxs1678_relay_master.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1678 */ -#include +#include #include #include diff --git a/maxscale-system-test/mxs1713_lots_of_databases.cpp b/maxscale-system-test/mxs1713_lots_of_databases.cpp index eb1806a5d..2f34ba327 100644 --- a/maxscale-system-test/mxs1713_lots_of_databases.cpp +++ b/maxscale-system-test/mxs1713_lots_of_databases.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1713 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1719.cpp b/maxscale-system-test/mxs1719.cpp index 7c616d31b..9865a2c42 100644 --- a/maxscale-system-test/mxs1719.cpp +++ b/maxscale-system-test/mxs1719.cpp @@ -12,7 +12,7 @@ */ #include -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs1731_old_persisted_config.cpp b/maxscale-system-test/mxs1731_old_persisted_config.cpp index 0f1337193..0b9917970 100644 --- a/maxscale-system-test/mxs1731_old_persisted_config.cpp +++ b/maxscale-system-test/mxs1731_old_persisted_config.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1731 */ -#include +#include #include #include diff --git a/maxscale-system-test/mxs173_throttle_filter.cpp b/maxscale-system-test/mxs173_throttle_filter.cpp index 6d6410732..00193267b 100644 --- a/maxscale-system-test/mxs173_throttle_filter.cpp +++ b/maxscale-system-test/mxs173_throttle_filter.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include DEFINE_EXCEPTION(Whoopsy); diff --git a/maxscale-system-test/mxs1743_rconn_bitmask.cpp b/maxscale-system-test/mxs1743_rconn_bitmask.cpp index a85a06216..fa8ae9998 100644 --- a/maxscale-system-test/mxs1743_rconn_bitmask.cpp +++ b/maxscale-system-test/mxs1743_rconn_bitmask.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1743 */ -#include +#include #include int main(int argc, char** argv) diff --git a/maxscale-system-test/mxs1751_available_when_donor_crash.cpp b/maxscale-system-test/mxs1751_available_when_donor_crash.cpp index bab1abb7f..456c4ff64 100644 --- a/maxscale-system-test/mxs1751_available_when_donor_crash.cpp +++ b/maxscale-system-test/mxs1751_available_when_donor_crash.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs1760_use_sql_variables_in.cpp b/maxscale-system-test/mxs1760_use_sql_variables_in.cpp index 7474f9c78..67c1916f5 100644 --- a/maxscale-system-test/mxs1760_use_sql_variables_in.cpp +++ b/maxscale-system-test/mxs1760_use_sql_variables_in.cpp @@ -5,7 +5,7 @@ * https://jira.mariadb.org/browse/MXS-1760 */ -#include +#include #include #include diff --git a/maxscale-system-test/mxs1773_failing_ldli.cpp b/maxscale-system-test/mxs1773_failing_ldli.cpp index e394f7e0e..83aa8c562 100644 --- a/maxscale-system-test/mxs1773_failing_ldli.cpp +++ b/maxscale-system-test/mxs1773_failing_ldli.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1773 */ -#include +#include #include int main(int argc, char** argv) diff --git a/maxscale-system-test/mxs1776_ps_exec_hang.cpp b/maxscale-system-test/mxs1776_ps_exec_hang.cpp index 71123f1eb..7b70d7350 100644 --- a/maxscale-system-test/mxs1776_ps_exec_hang.cpp +++ b/maxscale-system-test/mxs1776_ps_exec_hang.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1778_causal_reads.cpp b/maxscale-system-test/mxs1778_causal_reads.cpp index 7a7fe6109..0ecbf5d8f 100644 --- a/maxscale-system-test/mxs1778_causal_reads.cpp +++ b/maxscale-system-test/mxs1778_causal_reads.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1778 */ -#include +#include static std::string master; diff --git a/maxscale-system-test/mxs1787_call_ps.cpp b/maxscale-system-test/mxs1787_call_ps.cpp index 7c16c03ee..11222e2e9 100644 --- a/maxscale-system-test/mxs1787_call_ps.cpp +++ b/maxscale-system-test/mxs1787_call_ps.cpp @@ -2,7 +2,7 @@ * MXS-1787: Crash with PS: CALL p1((SELECT f1()), ?) */ -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs1787_slave_reconnection.cpp b/maxscale-system-test/mxs1787_slave_reconnection.cpp index 7bfeaeab4..81439c36d 100644 --- a/maxscale-system-test/mxs1787_slave_reconnection.cpp +++ b/maxscale-system-test/mxs1787_slave_reconnection.cpp @@ -5,7 +5,7 @@ * readwritesplit slave reconnection and execution of session commands. */ -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs1804_long_ps_hang.cpp b/maxscale-system-test/mxs1804_long_ps_hang.cpp index ddab67f68..15ac3709d 100644 --- a/maxscale-system-test/mxs1804_long_ps_hang.cpp +++ b/maxscale-system-test/mxs1804_long_ps_hang.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1804 */ -#include +#include int sql_str_size(int sqlsize) { diff --git a/maxscale-system-test/mxs1808_long_data.cpp b/maxscale-system-test/mxs1808_long_data.cpp index 73e9d0d7d..0a642edd7 100644 --- a/maxscale-system-test/mxs1808_long_data.cpp +++ b/maxscale-system-test/mxs1808_long_data.cpp @@ -1,4 +1,4 @@ -#include +#include #include using namespace std; diff --git a/maxscale-system-test/mxs1824_double_cursor.cpp b/maxscale-system-test/mxs1824_double_cursor.cpp index 757c082ae..9b91946dc 100644 --- a/maxscale-system-test/mxs1824_double_cursor.cpp +++ b/maxscale-system-test/mxs1824_double_cursor.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1824 */ -#include +#include void double_cursor(TestConnections& test, MYSQL* conn) { diff --git a/maxscale-system-test/mxs1828_double_local_infile.cpp b/maxscale-system-test/mxs1828_double_local_infile.cpp index 6ce93e7dd..92893fdc4 100644 --- a/maxscale-system-test/mxs1828_double_local_infile.cpp +++ b/maxscale-system-test/mxs1828_double_local_infile.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1828 */ -#include +#include #include using namespace std; diff --git a/maxscale-system-test/mxs1831_unknown_param.cpp b/maxscale-system-test/mxs1831_unknown_param.cpp index d233ceb11..df95254fa 100644 --- a/maxscale-system-test/mxs1831_unknown_param.cpp +++ b/maxscale-system-test/mxs1831_unknown_param.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1831 */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1836_show_eventTimes.cpp b/maxscale-system-test/mxs1836_show_eventTimes.cpp index aeb1ca99f..2ec68d67f 100644 --- a/maxscale-system-test/mxs1836_show_eventTimes.cpp +++ b/maxscale-system-test/mxs1836_show_eventTimes.cpp @@ -12,7 +12,7 @@ */ #include -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs1849_table_sharding.cpp b/maxscale-system-test/mxs1849_table_sharding.cpp index bfe50bad2..4ca957f79 100644 --- a/maxscale-system-test/mxs1849_table_sharding.cpp +++ b/maxscale-system-test/mxs1849_table_sharding.cpp @@ -6,7 +6,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs1873_large_sescmd.cpp b/maxscale-system-test/mxs1873_large_sescmd.cpp index 678db5521..268a35c5d 100644 --- a/maxscale-system-test/mxs1873_large_sescmd.cpp +++ b/maxscale-system-test/mxs1873_large_sescmd.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1873 */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1889.cpp b/maxscale-system-test/mxs1889.cpp index 83cfb1eeb..82bedf7d3 100644 --- a/maxscale-system-test/mxs1889.cpp +++ b/maxscale-system-test/mxs1889.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1889 */ -#include +#include #include #include diff --git a/maxscale-system-test/mxs1896_load_data_infile.cpp b/maxscale-system-test/mxs1896_load_data_infile.cpp index 520175f0a..ecbd8b297 100644 --- a/maxscale-system-test/mxs1896_load_data_infile.cpp +++ b/maxscale-system-test/mxs1896_load_data_infile.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1896 */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1899_generated_cnf.cpp b/maxscale-system-test/mxs1899_generated_cnf.cpp index 7952cb56a..003f96cbb 100644 --- a/maxscale-system-test/mxs1899_generated_cnf.cpp +++ b/maxscale-system-test/mxs1899_generated_cnf.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1899 */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1926_killed_server.cpp b/maxscale-system-test/mxs1926_killed_server.cpp index 0b6193a78..07e1a709b 100644 --- a/maxscale-system-test/mxs1926_killed_server.cpp +++ b/maxscale-system-test/mxs1926_killed_server.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1926 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs1929_filter_runtime.cpp b/maxscale-system-test/mxs1929_filter_runtime.cpp index 11d71b2b4..bbd9387dc 100644 --- a/maxscale-system-test/mxs1929_filter_runtime.cpp +++ b/maxscale-system-test/mxs1929_filter_runtime.cpp @@ -2,7 +2,7 @@ * MXS-1929: Runtime filter creation */ -#include +#include #include #include diff --git a/maxscale-system-test/mxs1929_service_runtime.cpp b/maxscale-system-test/mxs1929_service_runtime.cpp index 99476f3fe..4b3633fed 100644 --- a/maxscale-system-test/mxs1929_service_runtime.cpp +++ b/maxscale-system-test/mxs1929_service_runtime.cpp @@ -1,7 +1,7 @@ /** * MXS-1929: Runtime service creation */ -#include +#include #include #include diff --git a/maxscale-system-test/mxs1929_start_from_scratch.cpp b/maxscale-system-test/mxs1929_start_from_scratch.cpp index 9d5de5273..5c927454c 100644 --- a/maxscale-system-test/mxs1929_start_from_scratch.cpp +++ b/maxscale-system-test/mxs1929_start_from_scratch.cpp @@ -3,7 +3,7 @@ * repeated multiple times */ -#include +#include #include #include diff --git a/maxscale-system-test/mxs1932_hidden_cnf.cpp b/maxscale-system-test/mxs1932_hidden_cnf.cpp index aed35bdd3..def3a279b 100644 --- a/maxscale-system-test/mxs1932_hidden_cnf.cpp +++ b/maxscale-system-test/mxs1932_hidden_cnf.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1932 */ -#include +#include #include #include diff --git a/maxscale-system-test/mxs1947_composite_roles.cpp b/maxscale-system-test/mxs1947_composite_roles.cpp index 7d7f0aa4b..71bc573dd 100644 --- a/maxscale-system-test/mxs1947_composite_roles.cpp +++ b/maxscale-system-test/mxs1947_composite_roles.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-1947 */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1949_warn_user_injection.cpp b/maxscale-system-test/mxs1949_warn_user_injection.cpp index a3b3f3439..15217220d 100644 --- a/maxscale-system-test/mxs1949_warn_user_injection.cpp +++ b/maxscale-system-test/mxs1949_warn_user_injection.cpp @@ -5,7 +5,7 @@ * 'inject_service_user' is enabled. */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs1958_insert_priv.cpp b/maxscale-system-test/mxs1958_insert_priv.cpp index 507a0f437..ecb9b7738 100644 --- a/maxscale-system-test/mxs1958_insert_priv.cpp +++ b/maxscale-system-test/mxs1958_insert_priv.cpp @@ -1,4 +1,4 @@ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs1961_standalone_rejoin.cpp b/maxscale-system-test/mxs1961_standalone_rejoin.cpp index 908952690..a67420d31 100644 --- a/maxscale-system-test/mxs1961_standalone_rejoin.cpp +++ b/maxscale-system-test/mxs1961_standalone_rejoin.cpp @@ -2,7 +2,7 @@ * MXS-1961: Standalone master loses master status */ -#include +#include #include #include diff --git a/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp b/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp index bcc5ffb9c..e6454b266 100644 --- a/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp +++ b/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs1985_kill_hang.cpp b/maxscale-system-test/mxs1985_kill_hang.cpp index 602e454b3..dc2bd8ee0 100644 --- a/maxscale-system-test/mxs1985_kill_hang.cpp +++ b/maxscale-system-test/mxs1985_kill_hang.cpp @@ -2,7 +2,7 @@ * MXS-1985: MaxScale hangs on concurrent KILL processing */ -#include +#include #include #include diff --git a/maxscale-system-test/mxs2037_namedserver_wildcards.cpp b/maxscale-system-test/mxs2037_namedserver_wildcards.cpp index e63fcea75..f758145f9 100644 --- a/maxscale-system-test/mxs2037_namedserver_wildcards.cpp +++ b/maxscale-system-test/mxs2037_namedserver_wildcards.cpp @@ -10,7 +10,7 @@ */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs2043_select_for_update.cpp b/maxscale-system-test/mxs2043_select_for_update.cpp index 8a323b57b..84b51a6db 100644 --- a/maxscale-system-test/mxs2043_select_for_update.cpp +++ b/maxscale-system-test/mxs2043_select_for_update.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include // // This test makes all slaves read_only and then executes diff --git a/maxscale-system-test/mxs2054_hybrid_cluster.cpp b/maxscale-system-test/mxs2054_hybrid_cluster.cpp index e8e8d0954..216fbed84 100644 --- a/maxscale-system-test/mxs2054_hybrid_cluster.cpp +++ b/maxscale-system-test/mxs2054_hybrid_cluster.cpp @@ -2,7 +2,7 @@ * MXS-2054: Test "hybrid" clusters with namedserverfilter */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs2057_systemd_watchdog.cpp b/maxscale-system-test/mxs2057_systemd_watchdog.cpp index cfd0838e6..f5e0fa567 100644 --- a/maxscale-system-test/mxs2057_systemd_watchdog.cpp +++ b/maxscale-system-test/mxs2057_systemd_watchdog.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include namespace diff --git a/maxscale-system-test/mxs2106_avro_null.cpp b/maxscale-system-test/mxs2106_avro_null.cpp index e67107d51..8e8f700ad 100644 --- a/maxscale-system-test/mxs2106_avro_null.cpp +++ b/maxscale-system-test/mxs2106_avro_null.cpp @@ -2,7 +2,7 @@ * MXS-2106: Maxscale CDC JSON output does not respect null values */ -#include +#include #include int main(int argc, char** argv) diff --git a/maxscale-system-test/mxs2111_auth_string.cpp b/maxscale-system-test/mxs2111_auth_string.cpp index b4d1bcee0..2483b1299 100644 --- a/maxscale-system-test/mxs2111_auth_string.cpp +++ b/maxscale-system-test/mxs2111_auth_string.cpp @@ -2,7 +2,7 @@ * MXS-2111: The password is stored in `authentication_string` instead of `password` due to MDEV-16774 */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs2115_version_string.cpp b/maxscale-system-test/mxs2115_version_string.cpp index 12e7d10b6..38b8c3f94 100644 --- a/maxscale-system-test/mxs2115_version_string.cpp +++ b/maxscale-system-test/mxs2115_version_string.cpp @@ -5,7 +5,7 @@ * same version string. */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs2167_extra_port.cpp b/maxscale-system-test/mxs2167_extra_port.cpp index bc6554ce7..5bd681566 100644 --- a/maxscale-system-test/mxs2167_extra_port.cpp +++ b/maxscale-system-test/mxs2167_extra_port.cpp @@ -2,7 +2,7 @@ * MXS-2167: Monitors should be able to use extra_port */ -#include +#include #include using std::cout; diff --git a/maxscale-system-test/mxs2187_multi_replay.cpp b/maxscale-system-test/mxs2187_multi_replay.cpp index 80058db05..eca41ea4b 100644 --- a/maxscale-system-test/mxs2187_multi_replay.cpp +++ b/maxscale-system-test/mxs2187_multi_replay.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-1507 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs2250_describe_temp_table.cpp b/maxscale-system-test/mxs2250_describe_temp_table.cpp index 3ca8aea61..4104da45b 100644 --- a/maxscale-system-test/mxs2250_describe_temp_table.cpp +++ b/maxscale-system-test/mxs2250_describe_temp_table.cpp @@ -11,8 +11,8 @@ * Public License. */ -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs2273_being_drained.cpp b/maxscale-system-test/mxs2273_being_drained.cpp index a2bcfb5c2..4bcc98c93 100644 --- a/maxscale-system-test/mxs2273_being_drained.cpp +++ b/maxscale-system-test/mxs2273_being_drained.cpp @@ -16,7 +16,7 @@ * https://jira.mariadb.org/browse/MXS-2273 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs2295_change_user_loop.cpp b/maxscale-system-test/mxs2295_change_user_loop.cpp index 1ad515a46..e2fd2868d 100644 --- a/maxscale-system-test/mxs2295_change_user_loop.cpp +++ b/maxscale-system-test/mxs2295_change_user_loop.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2295 */ -#include +#include int main(int argc, char *argv[]) { diff --git a/maxscale-system-test/mxs2300_history_pruning.cpp b/maxscale-system-test/mxs2300_history_pruning.cpp index 81d08f4c8..466562f86 100644 --- a/maxscale-system-test/mxs2300_history_pruning.cpp +++ b/maxscale-system-test/mxs2300_history_pruning.cpp @@ -2,7 +2,7 @@ * MXS-2300: Session command history pruning */ -#include +#include #include std::vector ids; diff --git a/maxscale-system-test/mxs2313_rank.cpp b/maxscale-system-test/mxs2313_rank.cpp index a42de2bf0..d3f9f0d8e 100644 --- a/maxscale-system-test/mxs2313_rank.cpp +++ b/maxscale-system-test/mxs2313_rank.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2313 */ -#include +#include #include std::function block_wait; diff --git a/maxscale-system-test/mxs2326_hint_clone.cpp b/maxscale-system-test/mxs2326_hint_clone.cpp index 55cd4c01c..2f816e4a7 100644 --- a/maxscale-system-test/mxs2326_hint_clone.cpp +++ b/maxscale-system-test/mxs2326_hint_clone.cpp @@ -2,7 +2,7 @@ * MXS-2326: Routing hints aren't cloned in gwbuf_clone */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs2350_lazy_connect.cpp b/maxscale-system-test/mxs2350_lazy_connect.cpp index b4dc23d24..fc10d88b6 100644 --- a/maxscale-system-test/mxs2350_lazy_connect.cpp +++ b/maxscale-system-test/mxs2350_lazy_connect.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2350 */ -#include +#include #include int main(int argc, char* argv[]) diff --git a/maxscale-system-test/mxs2355_wrong_auth.cpp b/maxscale-system-test/mxs2355_wrong_auth.cpp index 6a668103f..52f265878 100644 --- a/maxscale-system-test/mxs2355_wrong_auth.cpp +++ b/maxscale-system-test/mxs2355_wrong_auth.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include // Try to connect with mysql client using the plugin "mysql_clear_password". MaxScale should switch back // to "mysql_native_password". diff --git a/maxscale-system-test/mxs2414_host_blocking.cpp b/maxscale-system-test/mxs2414_host_blocking.cpp index da042a9ca..4de98a4a5 100644 --- a/maxscale-system-test/mxs2414_host_blocking.cpp +++ b/maxscale-system-test/mxs2414_host_blocking.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2414 */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs2417_ignore_persisted_cnf.cpp b/maxscale-system-test/mxs2417_ignore_persisted_cnf.cpp index 760cb4fea..1c7d7021e 100644 --- a/maxscale-system-test/mxs2417_ignore_persisted_cnf.cpp +++ b/maxscale-system-test/mxs2417_ignore_persisted_cnf.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2417 */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs2441_galera_slaves.cpp b/maxscale-system-test/mxs2441_galera_slaves.cpp index 0c65c5d95..f022812e6 100644 --- a/maxscale-system-test/mxs2441_galera_slaves.cpp +++ b/maxscale-system-test/mxs2441_galera_slaves.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2441 */ -#include +#include #include #include diff --git a/maxscale-system-test/mxs244_prepared_stmt_loop.cpp b/maxscale-system-test/mxs244_prepared_stmt_loop.cpp index 494b5428c..77b00c321 100644 --- a/maxscale-system-test/mxs244_prepared_stmt_loop.cpp +++ b/maxscale-system-test/mxs244_prepared_stmt_loop.cpp @@ -13,7 +13,7 @@ */ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs2450_change_user_crash.cpp b/maxscale-system-test/mxs2450_change_user_crash.cpp index f990ca97f..b8e1cd840 100644 --- a/maxscale-system-test/mxs2450_change_user_crash.cpp +++ b/maxscale-system-test/mxs2450_change_user_crash.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2450 */ -#include +#include int main(int argc, char *argv[]) { diff --git a/maxscale-system-test/mxs2456_trx_replay_cap.cpp b/maxscale-system-test/mxs2456_trx_replay_cap.cpp index b4efc18da..214f5afd0 100644 --- a/maxscale-system-test/mxs2456_trx_replay_cap.cpp +++ b/maxscale-system-test/mxs2456_trx_replay_cap.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2456 */ -#include +#include #define EXPECT(a) test.expect(a, "%s", "Assertion failed: " #a) diff --git a/maxscale-system-test/mxs2464_sescmd_reconnect.cpp b/maxscale-system-test/mxs2464_sescmd_reconnect.cpp index 2f97b3435..683099cc3 100644 --- a/maxscale-system-test/mxs2464_sescmd_reconnect.cpp +++ b/maxscale-system-test/mxs2464_sescmd_reconnect.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2464 */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs2490_ps_execute_direct.cpp b/maxscale-system-test/mxs2490_ps_execute_direct.cpp index 5a49de980..94bdecd05 100644 --- a/maxscale-system-test/mxs2490_ps_execute_direct.cpp +++ b/maxscale-system-test/mxs2490_ps_execute_direct.cpp @@ -7,7 +7,7 @@ * https://mariadb.com/kb/en/library/com_stmt_execute/#statement-id */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs2512_trx_replay_rollback.cpp b/maxscale-system-test/mxs2512_trx_replay_rollback.cpp index d2e869663..a8344407e 100644 --- a/maxscale-system-test/mxs2512_trx_replay_rollback.cpp +++ b/maxscale-system-test/mxs2512_trx_replay_rollback.cpp @@ -14,8 +14,8 @@ #include #include #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/mxs2520_master_read_reconnect.cpp b/maxscale-system-test/mxs2520_master_read_reconnect.cpp index 6f5ec9189..0526e9d26 100644 --- a/maxscale-system-test/mxs2520_master_read_reconnect.cpp +++ b/maxscale-system-test/mxs2520_master_read_reconnect.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2520 */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs2521_double_exec.cpp b/maxscale-system-test/mxs2521_double_exec.cpp index f8a2af2a2..6a229e259 100644 --- a/maxscale-system-test/mxs2521_double_exec.cpp +++ b/maxscale-system-test/mxs2521_double_exec.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2521 */ -#include +#include void do_test(TestConnections& test, MYSQL* conn) { diff --git a/maxscale-system-test/mxs2563_concurrent_slave_failure.cpp b/maxscale-system-test/mxs2563_concurrent_slave_failure.cpp index d39003bc0..150509a65 100644 --- a/maxscale-system-test/mxs2563_concurrent_slave_failure.cpp +++ b/maxscale-system-test/mxs2563_concurrent_slave_failure.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2563 */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs2609_history_replay.cpp b/maxscale-system-test/mxs2609_history_replay.cpp index 481a80d59..d0c94e85d 100644 --- a/maxscale-system-test/mxs2609_history_replay.cpp +++ b/maxscale-system-test/mxs2609_history_replay.cpp @@ -9,7 +9,7 @@ */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs2621_lower_case_tables.cpp b/maxscale-system-test/mxs2621_lower_case_tables.cpp index 718ea0ed8..8aae77f50 100644 --- a/maxscale-system-test/mxs2621_lower_case_tables.cpp +++ b/maxscale-system-test/mxs2621_lower_case_tables.cpp @@ -3,7 +3,7 @@ * https://jira.mariadb.org/browse/MXS-2621 */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs2631_ignore_system_tables.cpp b/maxscale-system-test/mxs2631_ignore_system_tables.cpp index 841b4eb18..35a2f24da 100644 --- a/maxscale-system-test/mxs2631_ignore_system_tables.cpp +++ b/maxscale-system-test/mxs2631_ignore_system_tables.cpp @@ -6,7 +6,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs2785_binlogfilter_rewrite.cpp b/maxscale-system-test/mxs2785_binlogfilter_rewrite.cpp index f47d2f48b..e40ee2acd 100644 --- a/maxscale-system-test/mxs2785_binlogfilter_rewrite.cpp +++ b/maxscale-system-test/mxs2785_binlogfilter_rewrite.cpp @@ -1,4 +1,4 @@ -#include +#include #include int main(int argc, char** argv) diff --git a/maxscale-system-test/mxs280_select_outfile.cpp b/maxscale-system-test/mxs280_select_outfile.cpp index 669a3bd38..f0ae402a3 100644 --- a/maxscale-system-test/mxs280_select_outfile.cpp +++ b/maxscale-system-test/mxs280_select_outfile.cpp @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/mxs2878_monitor_ssl.cpp b/maxscale-system-test/mxs2878_monitor_ssl.cpp index d19be0c2e..8ce1eca4e 100644 --- a/maxscale-system-test/mxs2878_monitor_ssl.cpp +++ b/maxscale-system-test/mxs2878_monitor_ssl.cpp @@ -4,7 +4,7 @@ * MXS-2896: Server wrongly in Running state after failure to connect */ -#include +#include #include std::string join(StringSet st) diff --git a/maxscale-system-test/mxs2919_broken_slaves.cpp b/maxscale-system-test/mxs2919_broken_slaves.cpp index 94456e627..416e2da7d 100644 --- a/maxscale-system-test/mxs2919_broken_slaves.cpp +++ b/maxscale-system-test/mxs2919_broken_slaves.cpp @@ -3,7 +3,7 @@ * used. */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs2939_sescmd_reconnect.cpp b/maxscale-system-test/mxs2939_sescmd_reconnect.cpp index 1cc9d3436..4ab109efd 100644 --- a/maxscale-system-test/mxs2939_sescmd_reconnect.cpp +++ b/maxscale-system-test/mxs2939_sescmd_reconnect.cpp @@ -2,7 +2,7 @@ * MXS-2939: Test that session commands trigger a reconnection */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs2972_shard_caching.cc b/maxscale-system-test/mxs2972_shard_caching.cc index 22f957b8f..9c9d1eceb 100644 --- a/maxscale-system-test/mxs2972_shard_caching.cc +++ b/maxscale-system-test/mxs2972_shard_caching.cc @@ -1,4 +1,4 @@ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs314.cpp b/maxscale-system-test/mxs314.cpp index a040bdb34..d2e8a24d4 100644 --- a/maxscale-system-test/mxs314.cpp +++ b/maxscale-system-test/mxs314.cpp @@ -4,7 +4,7 @@ * - check if Maxscale alive */ -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs321.cpp b/maxscale-system-test/mxs321.cpp index 7314b481a..9fc838745 100644 --- a/maxscale-system-test/mxs321.cpp +++ b/maxscale-system-test/mxs321.cpp @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/mxs359_error_on_write.cpp b/maxscale-system-test/mxs359_error_on_write.cpp index 7ab1d883b..e77c9f17c 100644 --- a/maxscale-system-test/mxs359_error_on_write.cpp +++ b/maxscale-system-test/mxs359_error_on_write.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-359 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs359_master_switch.cpp b/maxscale-system-test/mxs359_master_switch.cpp index 4e60183b6..a867d5594 100644 --- a/maxscale-system-test/mxs359_master_switch.cpp +++ b/maxscale-system-test/mxs359_master_switch.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-359 */ -#include +#include TestConnections* global_test; diff --git a/maxscale-system-test/mxs359_read_only.cpp b/maxscale-system-test/mxs359_read_only.cpp index 189b2dbe4..6c621c2fc 100644 --- a/maxscale-system-test/mxs359_read_only.cpp +++ b/maxscale-system-test/mxs359_read_only.cpp @@ -3,7 +3,7 @@ * * https://jira.mariadb.org/browse/MXS-359 */ -#include +#include #include #include #include diff --git a/maxscale-system-test/mxs365.cpp b/maxscale-system-test/mxs365.cpp index 6fe1cafdc..61ed93ff9 100644 --- a/maxscale-system-test/mxs365.cpp +++ b/maxscale-system-test/mxs365.cpp @@ -6,7 +6,7 @@ */ -#include +#include void create_data_file(char* filename, size_t size) { diff --git a/maxscale-system-test/mxs37_table_privilege.cpp b/maxscale-system-test/mxs37_table_privilege.cpp index eeeb25444..a7a90746d 100644 --- a/maxscale-system-test/mxs37_table_privilege.cpp +++ b/maxscale-system-test/mxs37_table_privilege.cpp @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/mxs421_events.cpp b/maxscale-system-test/mxs421_events.cpp index 25c0491e9..d8064e9a2 100644 --- a/maxscale-system-test/mxs421_events.cpp +++ b/maxscale-system-test/mxs421_events.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs431.cpp b/maxscale-system-test/mxs431.cpp index d136c8a6b..3a361882c 100644 --- a/maxscale-system-test/mxs431.cpp +++ b/maxscale-system-test/mxs431.cpp @@ -5,7 +5,7 @@ * - Connect repeatedly to MaxScale with 'testdb' as the default database and execute SELECT 1 */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs548_short_session_change_user.cpp b/maxscale-system-test/mxs548_short_session_change_user.cpp index bd797f2bf..d45845eba 100644 --- a/maxscale-system-test/mxs548_short_session_change_user.cpp +++ b/maxscale-system-test/mxs548_short_session_change_user.cpp @@ -11,8 +11,8 @@ */ -#include -#include +#include +#include #include diff --git a/maxscale-system-test/mxs559_block_master.cpp b/maxscale-system-test/mxs559_block_master.cpp index 7a1cbb131..0e3c5e815 100644 --- a/maxscale-system-test/mxs559_block_master.cpp +++ b/maxscale-system-test/mxs559_block_master.cpp @@ -10,8 +10,8 @@ */ -#include -#include +#include +#include #include typedef struct diff --git a/maxscale-system-test/mxs564_big_dump.cpp b/maxscale-system-test/mxs564_big_dump.cpp index b9784d050..efe744938 100644 --- a/maxscale-system-test/mxs564_big_dump.cpp +++ b/maxscale-system-test/mxs564_big_dump.cpp @@ -10,8 +10,8 @@ * - check Maxscale is alive */ -#include -#include +#include +#include #include #include diff --git a/maxscale-system-test/mxs621_unreadable_cnf.cpp b/maxscale-system-test/mxs621_unreadable_cnf.cpp index edb97555b..4826b75a6 100644 --- a/maxscale-system-test/mxs621_unreadable_cnf.cpp +++ b/maxscale-system-test/mxs621_unreadable_cnf.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs657_restart.cpp b/maxscale-system-test/mxs657_restart.cpp index 221104839..7a52a8168 100644 --- a/maxscale-system-test/mxs657_restart.cpp +++ b/maxscale-system-test/mxs657_restart.cpp @@ -4,9 +4,9 @@ * - playing with 'restart service' and restart Maxscale under load */ -#include -#include -#include +#include +#include +#include TestConnections* Test; diff --git a/maxscale-system-test/mxs657_restart_service.cpp b/maxscale-system-test/mxs657_restart_service.cpp index 52216548d..b6684fce6 100644 --- a/maxscale-system-test/mxs657_restart_service.cpp +++ b/maxscale-system-test/mxs657_restart_service.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include using namespace std; void* query_thread1(void* ptr); diff --git a/maxscale-system-test/mxs701_binlog_filter.cpp b/maxscale-system-test/mxs701_binlog_filter.cpp index 56c6af641..23afbfe76 100644 --- a/maxscale-system-test/mxs701_binlog_filter.cpp +++ b/maxscale-system-test/mxs701_binlog_filter.cpp @@ -2,7 +2,7 @@ * MXS-701: Binlog filtering */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/mxs716.cpp b/maxscale-system-test/mxs716.cpp index d0fea6600..1afec4194 100644 --- a/maxscale-system-test/mxs716.cpp +++ b/maxscale-system-test/mxs716.cpp @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include void run_test(TestConnections* Test, const char* database) { diff --git a/maxscale-system-test/mxs722.cpp b/maxscale-system-test/mxs722.cpp index 424840dd8..2283ec2c2 100644 --- a/maxscale-system-test/mxs722.cpp +++ b/maxscale-system-test/mxs722.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs729_maxadmin.cpp b/maxscale-system-test/mxs729_maxadmin.cpp index 6d9708a29..d58d8c215 100644 --- a/maxscale-system-test/mxs729_maxadmin.cpp +++ b/maxscale-system-test/mxs729_maxadmin.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs781_binlog_wrong_passwrd.cpp b/maxscale-system-test/mxs781_binlog_wrong_passwrd.cpp index c48ac6476..052688cf1 100644 --- a/maxscale-system-test/mxs781_binlog_wrong_passwrd.cpp +++ b/maxscale-system-test/mxs781_binlog_wrong_passwrd.cpp @@ -7,9 +7,9 @@ #include -#include -#include -#include +#include +#include +#include const char* setup_binlog_wrong_passwrd = diff --git a/maxscale-system-test/mxs812_1.cpp b/maxscale-system-test/mxs812_1.cpp index b19545b5f..329bcdda9 100644 --- a/maxscale-system-test/mxs812_1.cpp +++ b/maxscale-system-test/mxs812_1.cpp @@ -9,7 +9,7 @@ * - repeat test 2 times */ -#include +#include void run_test(TestConnections& test, size_t size, int chunks) { diff --git a/maxscale-system-test/mxs812_2.cpp b/maxscale-system-test/mxs812_2.cpp index ed9f4459a..65a790b7c 100644 --- a/maxscale-system-test/mxs812_2.cpp +++ b/maxscale-system-test/mxs812_2.cpp @@ -6,7 +6,7 @@ * - checks "Current no. of conns" after the test, expect 0 */ -#include +#include int test_ps(TestConnections* Test, MYSQL* conn) { diff --git a/maxscale-system-test/mxs813_long_hostname.cpp b/maxscale-system-test/mxs813_long_hostname.cpp index 0ecad3bdc..7462e6fa5 100644 --- a/maxscale-system-test/mxs813_long_hostname.cpp +++ b/maxscale-system-test/mxs813_long_hostname.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs822_maxpasswd.cpp b/maxscale-system-test/mxs822_maxpasswd.cpp index 735fa1968..72b0f0b12 100644 --- a/maxscale-system-test/mxs822_maxpasswd.cpp +++ b/maxscale-system-test/mxs822_maxpasswd.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs827_write_timeout.cpp b/maxscale-system-test/mxs827_write_timeout.cpp index 19c25d7d4..b783d87fb 100644 --- a/maxscale-system-test/mxs827_write_timeout.cpp +++ b/maxscale-system-test/mxs827_write_timeout.cpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/mxs872_roles.cpp b/maxscale-system-test/mxs872_roles.cpp index 8858fdc4c..b7b67453c 100644 --- a/maxscale-system-test/mxs872_roles.cpp +++ b/maxscale-system-test/mxs872_roles.cpp @@ -4,7 +4,7 @@ * https://jira.mariadb.org/browse/MXS-872 */ -#include +#include #include using namespace std; diff --git a/maxscale-system-test/mxs874_slave_recovery.cpp b/maxscale-system-test/mxs874_slave_recovery.cpp index 03b5400c9..5e1ecf181 100644 --- a/maxscale-system-test/mxs874_slave_recovery.cpp +++ b/maxscale-system-test/mxs874_slave_recovery.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/mxs922_bad_server.cpp b/maxscale-system-test/mxs922_bad_server.cpp index 75064d886..548797292 100644 --- a/maxscale-system-test/mxs922_bad_server.cpp +++ b/maxscale-system-test/mxs922_bad_server.cpp @@ -3,7 +3,7 @@ * */ -#include +#include #define MONITOR_NAME "mysql-monitor" #define SERVICE_NAME "rwsplit-service" diff --git a/maxscale-system-test/mxs922_double_listener.cpp b/maxscale-system-test/mxs922_double_listener.cpp index 9fd8d1e65..84660ddf0 100644 --- a/maxscale-system-test/mxs922_double_listener.cpp +++ b/maxscale-system-test/mxs922_double_listener.cpp @@ -4,7 +4,7 @@ * Check that MaxScale doesn't crash when the same listeners are created twice. */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs922_listener_ssl.cpp b/maxscale-system-test/mxs922_listener_ssl.cpp index 5655214df..3ede2fd88 100644 --- a/maxscale-system-test/mxs922_listener_ssl.cpp +++ b/maxscale-system-test/mxs922_listener_ssl.cpp @@ -2,8 +2,8 @@ * @file mxs922_listener_ssl.cpp MXS-922: Dynamic SSL test */ -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs922_monitor.cpp b/maxscale-system-test/mxs922_monitor.cpp index 24bc5c818..c2bf80ca5 100644 --- a/maxscale-system-test/mxs922_monitor.cpp +++ b/maxscale-system-test/mxs922_monitor.cpp @@ -3,7 +3,7 @@ * */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/mxs922_restart.cpp b/maxscale-system-test/mxs922_restart.cpp index 522a5a83c..27832e657 100644 --- a/maxscale-system-test/mxs922_restart.cpp +++ b/maxscale-system-test/mxs922_restart.cpp @@ -3,7 +3,7 @@ * */ -#include +#include #define MONITOR_NAME "mysql-monitor" #define SERVICE_NAME1 "rwsplit-service" diff --git a/maxscale-system-test/mxs922_scaling.cpp b/maxscale-system-test/mxs922_scaling.cpp index fefac5ebc..e6c452f1f 100644 --- a/maxscale-system-test/mxs922_scaling.cpp +++ b/maxscale-system-test/mxs922_scaling.cpp @@ -3,8 +3,8 @@ * */ -#include -#include +#include +#include static bool running = true; diff --git a/maxscale-system-test/mxs922_server.cpp b/maxscale-system-test/mxs922_server.cpp index 999d2916a..4790de7e9 100644 --- a/maxscale-system-test/mxs922_server.cpp +++ b/maxscale-system-test/mxs922_server.cpp @@ -3,8 +3,8 @@ * */ -#include -#include +#include +#include int check_server_id(TestConnections* test, int idx) { diff --git a/maxscale-system-test/mxs951_utfmb4.cpp b/maxscale-system-test/mxs951_utfmb4.cpp index 654d7e1b3..ea663be9c 100644 --- a/maxscale-system-test/mxs951_utfmb4.cpp +++ b/maxscale-system-test/mxs951_utfmb4.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/namedserverfilter.cpp b/maxscale-system-test/namedserverfilter.cpp index 167488f46..6ce72d2fb 100644 --- a/maxscale-system-test/namedserverfilter.cpp +++ b/maxscale-system-test/namedserverfilter.cpp @@ -6,7 +6,7 @@ * `match=SELECT` which should match any SELECT query. */ -#include +#include #include using std::cout; diff --git a/maxscale-system-test/no_password.cpp b/maxscale-system-test/no_password.cpp index ba20f2c67..758628d04 100644 --- a/maxscale-system-test/no_password.cpp +++ b/maxscale-system-test/no_password.cpp @@ -2,7 +2,7 @@ * Check that using no password returns correct error message */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/non_native_setup.cpp b/maxscale-system-test/non_native_setup.cpp index 60592fc0f..4a9fa0b60 100644 --- a/maxscale-system-test/non_native_setup.cpp +++ b/maxscale-system-test/non_native_setup.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/open_close_connections.cpp b/maxscale-system-test/open_close_connections.cpp index 437aee82a..676cf88ac 100644 --- a/maxscale-system-test/open_close_connections.cpp +++ b/maxscale-system-test/open_close_connections.cpp @@ -4,7 +4,7 @@ * - 20 threads are opening and immediatelly closing connection in the loop */ -#include +#include #include #include diff --git a/maxscale-system-test/pam_authentication.cpp b/maxscale-system-test/pam_authentication.cpp index 0841b09aa..90814ac9a 100644 --- a/maxscale-system-test/pam_authentication.cpp +++ b/maxscale-system-test/pam_authentication.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include "mariadbmonitor/fail_switch_rejoin_common.cpp" #include #include diff --git a/maxscale-system-test/pers_01.cpp b/maxscale-system-test/pers_01.cpp index ffc551976..4c172de8d 100644 --- a/maxscale-system-test/pers_01.cpp +++ b/maxscale-system-test/pers_01.cpp @@ -29,8 +29,8 @@ */ -#include -#include +#include +#include void check_pers_conn(TestConnections* Test, int pers_conn_expected[], char* server) { diff --git a/maxscale-system-test/pers_02.cpp b/maxscale-system-test/pers_02.cpp index 2be76bb43..08addf2d9 100644 --- a/maxscale-system-test/pers_02.cpp +++ b/maxscale-system-test/pers_02.cpp @@ -12,8 +12,8 @@ */ -#include -#include +#include +#include int main(int argc, char* argv[]) diff --git a/maxscale-system-test/prepared_statement.cpp b/maxscale-system-test/prepared_statement.cpp index 1e9a8a5ed..3767db36e 100644 --- a/maxscale-system-test/prepared_statement.cpp +++ b/maxscale-system-test/prepared_statement.cpp @@ -11,8 +11,8 @@ * - check if Maxscale is alive */ -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/proxy_protocol.cpp b/maxscale-system-test/proxy_protocol.cpp index eaf352329..0a1f3cfc9 100644 --- a/maxscale-system-test/proxy_protocol.cpp +++ b/maxscale-system-test/proxy_protocol.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include using std::string; using std::cout; diff --git a/maxscale-system-test/readconnrouter_master.cpp b/maxscale-system-test/readconnrouter_master.cpp index 9d62402e3..adbb73e95 100644 --- a/maxscale-system-test/readconnrouter_master.cpp +++ b/maxscale-system-test/readconnrouter_master.cpp @@ -2,7 +2,7 @@ * Connect to readconnroute in master mode and check that it always connects to the master */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/readconnrouter_slave.cpp b/maxscale-system-test/readconnrouter_slave.cpp index 888ab1650..a02fb6813 100644 --- a/maxscale-system-test/readconnrouter_slave.cpp +++ b/maxscale-system-test/readconnrouter_slave.cpp @@ -8,7 +8,7 @@ #include -#include +#include using namespace std; diff --git a/maxscale-system-test/regexfilter1.cpp b/maxscale-system-test/regexfilter1.cpp index 65541ea19..b81192aff 100644 --- a/maxscale-system-test/regexfilter1.cpp +++ b/maxscale-system-test/regexfilter1.cpp @@ -9,7 +9,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/rw_select_insert.cpp b/maxscale-system-test/rw_select_insert.cpp index 951f1008c..b55646276 100644 --- a/maxscale-system-test/rw_select_insert.cpp +++ b/maxscale-system-test/rw_select_insert.cpp @@ -11,9 +11,9 @@ * - execute INSERT 100 times, check COM_SELECT and COM_INSERT after every query (tolerate 2*N+1 queries) */ -#include -#include -#include +#include +#include +#include /** * @brief check_com_select Checks if COM_SELECT increase takes place only on one slave node and there is no diff --git a/maxscale-system-test/rwsplit_conn_num.cpp b/maxscale-system-test/rwsplit_conn_num.cpp index 2b4e9b843..4b8211bc9 100644 --- a/maxscale-system-test/rwsplit_conn_num.cpp +++ b/maxscale-system-test/rwsplit_conn_num.cpp @@ -7,7 +7,7 @@ #include -#include +#include using namespace std; diff --git a/maxscale-system-test/rwsplit_connect.cpp b/maxscale-system-test/rwsplit_connect.cpp index b8bca0ef8..0c9a5427b 100644 --- a/maxscale-system-test/rwsplit_connect.cpp +++ b/maxscale-system-test/rwsplit_connect.cpp @@ -4,7 +4,7 @@ * - check number of connections on every backend, expect one active Slave and one connection to Master */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/rwsplit_multi_stmt.cpp b/maxscale-system-test/rwsplit_multi_stmt.cpp index cddd33367..d17559d92 100644 --- a/maxscale-system-test/rwsplit_multi_stmt.cpp +++ b/maxscale-system-test/rwsplit_multi_stmt.cpp @@ -9,7 +9,7 @@ * - Only the multi-statement query should go to the master */ -#include +#include int main(int argc, char** argv) { diff --git a/maxscale-system-test/rwsplit_readonly.cpp b/maxscale-system-test/rwsplit_readonly.cpp index c98946804..cf0a00c40 100644 --- a/maxscale-system-test/rwsplit_readonly.cpp +++ b/maxscale-system-test/rwsplit_readonly.cpp @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include void test_all_ok(TestConnections* Test) { diff --git a/maxscale-system-test/rwsplit_readonly_stress.cpp b/maxscale-system-test/rwsplit_readonly_stress.cpp index 234ad8713..aab4c0f40 100644 --- a/maxscale-system-test/rwsplit_readonly_stress.cpp +++ b/maxscale-system-test/rwsplit_readonly_stress.cpp @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #define THREADS 16 diff --git a/maxscale-system-test/sanity_check.cpp b/maxscale-system-test/sanity_check.cpp index c6ff156a0..3aea50d24 100644 --- a/maxscale-system-test/sanity_check.cpp +++ b/maxscale-system-test/sanity_check.cpp @@ -4,7 +4,7 @@ * Combines several old regression tests into one quick test. */ -#include +#include void test_rwsplit(TestConnections& test) diff --git a/maxscale-system-test/schemarouter_duplicate.cpp b/maxscale-system-test/schemarouter_duplicate.cpp index 3109188d9..dcb7d978a 100644 --- a/maxscale-system-test/schemarouter_duplicate.cpp +++ b/maxscale-system-test/schemarouter_duplicate.cpp @@ -10,7 +10,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/script.cpp b/maxscale-system-test/script.cpp index 41d7af88d..497f3e76c 100644 --- a/maxscale-system-test/script.cpp +++ b/maxscale-system-test/script.cpp @@ -34,7 +34,7 @@ #include -#include +#include void test_script_monitor(TestConnections* Test, Mariadb_nodes* nodes, char* expected_filename) { diff --git a/maxscale-system-test/sequence.cpp b/maxscale-system-test/sequence.cpp index 75e480164..eecbd24ea 100644 --- a/maxscale-system-test/sequence.cpp +++ b/maxscale-system-test/sequence.cpp @@ -4,7 +4,7 @@ * This test is only enabled when the backend version is 10.3 */ -#include +#include #include int main(int argc, char** argv) diff --git a/maxscale-system-test/server_weight.cpp b/maxscale-system-test/server_weight.cpp index afff043d0..c36a7b35d 100644 --- a/maxscale-system-test/server_weight.cpp +++ b/maxscale-system-test/server_weight.cpp @@ -8,7 +8,7 @@ */ -#include +#include void check_conn_num(TestConnections& test, int* Nc) { diff --git a/maxscale-system-test/session_limits.cpp b/maxscale-system-test/session_limits.cpp index 510aa23ff..f23af1a60 100644 --- a/maxscale-system-test/session_limits.cpp +++ b/maxscale-system-test/session_limits.cpp @@ -14,7 +14,7 @@ * - execute one more session commad, excpect failure */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/setup_binlog.cpp b/maxscale-system-test/setup_binlog.cpp index ce24164a3..01eccbc21 100644 --- a/maxscale-system-test/setup_binlog.cpp +++ b/maxscale-system-test/setup_binlog.cpp @@ -29,8 +29,8 @@ */ #include -#include -#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/setup_binlog_gtid.cpp b/maxscale-system-test/setup_binlog_gtid.cpp index eb63c44a3..a9429eb6b 100644 --- a/maxscale-system-test/setup_binlog_gtid.cpp +++ b/maxscale-system-test/setup_binlog_gtid.cpp @@ -4,9 +4,9 @@ */ #include -#include -#include -#include +#include +#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/sharding.cpp b/maxscale-system-test/sharding.cpp index 10ff6d8df..f9b54db8d 100644 --- a/maxscale-system-test/sharding.cpp +++ b/maxscale-system-test/sharding.cpp @@ -34,7 +34,7 @@ #include -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/sharding_load_data.cpp b/maxscale-system-test/sharding_load_data.cpp index be3df57d0..c0c8aa684 100644 --- a/maxscale-system-test/sharding_load_data.cpp +++ b/maxscale-system-test/sharding_load_data.cpp @@ -2,7 +2,7 @@ * MXS-1160: LOAD DATA LOCAL INFILE with schemarouter */ -#include +#include #include #include diff --git a/maxscale-system-test/short_sessions.cpp b/maxscale-system-test/short_sessions.cpp index 8b8542198..0f4ee9db5 100644 --- a/maxscale-system-test/short_sessions.cpp +++ b/maxscale-system-test/short_sessions.cpp @@ -11,8 +11,8 @@ #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/show_monitor_crash.cpp b/maxscale-system-test/show_monitor_crash.cpp index f155d6fb1..f0b998d14 100644 --- a/maxscale-system-test/show_monitor_crash.cpp +++ b/maxscale-system-test/show_monitor_crash.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/slave_failover.cpp b/maxscale-system-test/slave_failover.cpp index 91475293f..59cc750a2 100644 --- a/maxscale-system-test/slave_failover.cpp +++ b/maxscale-system-test/slave_failover.cpp @@ -13,7 +13,7 @@ */ -#include +#include int main(int argc, char* argv[]) { diff --git a/maxscale-system-test/smart_query.cpp b/maxscale-system-test/smart_query.cpp index fe74d80fa..0a07a3652 100644 --- a/maxscale-system-test/smart_query.cpp +++ b/maxscale-system-test/smart_query.cpp @@ -11,7 +11,7 @@ * Public License. */ -#include +#include #include #include #include diff --git a/maxscale-system-test/sql_queries.cpp b/maxscale-system-test/sql_queries.cpp index 47ab1092f..dd15ec62f 100644 --- a/maxscale-system-test/sql_queries.cpp +++ b/maxscale-system-test/sql_queries.cpp @@ -41,8 +41,8 @@ */ #include -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/sr_basics.cpp b/maxscale-system-test/sr_basics.cpp index 67e468666..8a61750ca 100644 --- a/maxscale-system-test/sr_basics.cpp +++ b/maxscale-system-test/sr_basics.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include using namespace std; diff --git a/maxscale-system-test/stale_slaves.cpp b/maxscale-system-test/stale_slaves.cpp index 4bb8747ed..941a5deb7 100644 --- a/maxscale-system-test/stale_slaves.cpp +++ b/maxscale-system-test/stale_slaves.cpp @@ -6,7 +6,7 @@ * should get slave status if replication is running. */ -#include +#include #include #include diff --git a/maxscale-system-test/sysbench_example.cpp b/maxscale-system-test/sysbench_example.cpp index b73af326f..e29876f20 100644 --- a/maxscale-system-test/sysbench_example.cpp +++ b/maxscale-system-test/sysbench_example.cpp @@ -8,7 +8,7 @@ */ -#include +#include #include "sysbench_commands.h" int main(int argc, char* argv[]) diff --git a/maxscale-system-test/sysbench_kill_slave.cpp b/maxscale-system-test/sysbench_kill_slave.cpp index b5e5a4019..9caad20e1 100644 --- a/maxscale-system-test/sysbench_kill_slave.cpp +++ b/maxscale-system-test/sysbench_kill_slave.cpp @@ -8,7 +8,7 @@ * - check if Maxscale is alive */ -#include +#include #include "sysbench_commands.h" TestConnections* Test; diff --git a/maxscale-system-test/temporal_tables.cpp b/maxscale-system-test/temporal_tables.cpp index e476669dc..cec436fdc 100644 --- a/maxscale-system-test/temporal_tables.cpp +++ b/maxscale-system-test/temporal_tables.cpp @@ -11,8 +11,8 @@ * - check that data from main t1 is not affected */ -#include -#include +#include +#include using namespace std; diff --git a/maxscale-system-test/test_hints.cpp b/maxscale-system-test/test_hints.cpp index b59c12716..d22bf32dc 100644 --- a/maxscale-system-test/test_hints.cpp +++ b/maxscale-system-test/test_hints.cpp @@ -6,7 +6,7 @@ #include -#include +#include #define SERVER1 0 #define SERVER2 1