From b9396092a259f30e30f80d05d1957d4af7d15d7b Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 31 Oct 2023 14:24:24 +0000 Subject: [PATCH] fix mysql includes --- test/tap/tests/admin-listen_on_unix-t.cpp | 2 +- test/tap/tests/admin_show_create_table-t.cpp | 2 +- test/tap/tests/admin_show_fields_from-t.cpp | 2 +- test/tap/tests/admin_show_table_status-t.cpp | 2 +- test/tap/tests/admin_various_commands-t.cpp | 2 +- test/tap/tests/admin_various_commands2-t.cpp | 2 +- test/tap/tests/admin_various_commands3-t.cpp | 2 +- test/tap/tests/firewall_commands1-t.cpp | 2 +- test/tap/tests/max_connections_ff-t.cpp | 2 +- test/tap/tests/multiple_prepared_statements-t.cpp | 2 +- .../tests/mysql_hostgroup_attributes-servers_defaults-t.cpp | 2 +- test/tap/tests/reg_test_1493-mixed_compression-t.cpp | 2 +- test/tap/tests/reg_test_2793-compression-t.cpp | 2 +- test/tap/tests/reg_test_3223-restapi_return_codes-t.cpp | 2 +- test/tap/tests/reg_test_3247-mycli_support-t.cpp | 2 +- .../tap/tests/reg_test_3427-stmt_first_comment1-param-t.cpp | 2 +- test/tap/tests/reg_test_3427-stmt_first_comment1-t.cpp | 2 +- .../tap/tests/reg_test_3427-stmt_first_comment2-param-t.cpp | 2 +- test/tap/tests/reg_test_3427-stmt_first_comment2-t.cpp | 2 +- test/tap/tests/reg_test_3504-change_user-t.cpp | 2 +- test/tap/tests/reg_test_3504-change_user_helper.cpp | 2 +- test/tap/tests/reg_test_3546-stmt_empty_params-t.cpp | 2 +- test/tap/tests/reg_test_3606-mysql_warnings-t.cpp | 2 +- .../reg_test_3625-sqlite3_session_client_error_limit-t.cpp | 2 +- test/tap/tests/reg_test_3838-restapi_eintr-t.cpp | 2 +- test/tap/tests/reg_test_3847_admin_lock-t.cpp | 2 +- test/tap/tests/reg_test_4072-show-warnings-t.cpp | 2 +- test/tap/tests/reg_test_4264-commit_rollback-t.cpp | 2 +- test/tap/tests/reg_test_4300-dollar_quote_check-t.cpp | 2 +- test/tap/tests/reg_test_sql_calc_found_rows-t.cpp | 2 +- test/tap/tests/reg_test_stmt_resultset_err_no_rows-t.cpp | 6 +++--- .../tap/tests/reg_test_stmt_resultset_err_no_rows_php-t.cpp | 2 +- ...test_admin_prometheus_metrics_dump-t_disabled_gh3571.cpp | 2 +- test/tap/tests/test_admin_stats-t.cpp | 2 +- test/tap/tests/test_auto_increment_delay_multiplex-t.cpp | 2 +- test/tap/tests/test_binlog_reader-t.cpp | 2 +- test/tap/tests/test_clickhouse_server-t.cpp | 2 +- .../tests/test_com_reset_connection_com_change_user-t.cpp | 2 +- test/tap/tests/test_connection_annotation-t.cpp | 2 +- test/tap/tests/test_default_conn_collation-t.cpp | 2 +- test/tap/tests/test_dns_cache-t.cpp | 2 +- test/tap/tests/test_gtid_forwarding-t.cpp | 2 +- test/tap/tests/test_log_last_insert_id-t.cpp | 2 +- test/tap/tests/test_mysql_connect_retries_delay-t.cpp | 2 +- test/tap/tests/test_mysqlsh-t.cpp | 2 +- test/tap/tests/test_prometheus_metrics-t.cpp | 2 +- .../tap/tests/test_query_rules_fast_routing_algorithm-t.cpp | 2 +- test/tap/tests/test_query_rules_routing-t.cpp | 2 +- test/tap/tests/test_rw_binary_data-t.cpp | 2 +- test/tap/tests/test_simple_embedded_HTTP_server-t.cpp | 2 +- test/tap/tests/test_sqlite3_server-t.cpp | 2 +- test/tap/tests/test_sqlite3_server_and_fast_routing-t.cpp | 2 +- test/tap/tests/test_ssl_connect-t.cpp | 2 +- test/tap/tests/test_stats_proxysql_message_metrics-t.cpp | 2 +- test/tap/tests/test_unshun_algorithm-t.cpp | 2 +- test/tap/tests/test_unsupported_queries-t.cpp | 2 +- .../deprecate_eof_support/deprecate_eof_cache-t.cpp | 2 +- .../deprecate_eof_support/eof_cache_mixed_flags-t.cpp | 2 +- .../deprecate_eof_support/eof_conn_options_check-t.cpp | 2 +- .../deprecate_eof_support/eof_fast_forward-t.cpp | 2 +- .../deprecate_eof_support/eof_mixed_flags_queries-t.cpp | 2 +- .../deprecate_eof_support/eof_packet_mixed_queries-t.cpp | 2 +- .../tests_with_deps/deprecate_eof_support/fwd_eof_query.cpp | 2 +- 63 files changed, 65 insertions(+), 65 deletions(-) diff --git a/test/tap/tests/admin-listen_on_unix-t.cpp b/test/tap/tests/admin-listen_on_unix-t.cpp index f562d3adea..94c6d0f2dd 100644 --- a/test/tap/tests/admin-listen_on_unix-t.cpp +++ b/test/tap/tests/admin-listen_on_unix-t.cpp @@ -5,7 +5,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" #include "tap.h" diff --git a/test/tap/tests/admin_show_create_table-t.cpp b/test/tap/tests/admin_show_create_table-t.cpp index 18aa4a4751..5a995b1a6b 100644 --- a/test/tap/tests/admin_show_create_table-t.cpp +++ b/test/tap/tests/admin_show_create_table-t.cpp @@ -7,7 +7,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/admin_show_fields_from-t.cpp b/test/tap/tests/admin_show_fields_from-t.cpp index 4578f5289f..8252bafd46 100644 --- a/test/tap/tests/admin_show_fields_from-t.cpp +++ b/test/tap/tests/admin_show_fields_from-t.cpp @@ -7,7 +7,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/admin_show_table_status-t.cpp b/test/tap/tests/admin_show_table_status-t.cpp index 27f57ebc05..1e48e78471 100644 --- a/test/tap/tests/admin_show_table_status-t.cpp +++ b/test/tap/tests/admin_show_table_status-t.cpp @@ -7,7 +7,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/admin_various_commands-t.cpp b/test/tap/tests/admin_various_commands-t.cpp index 86016e91c8..cbc2ea3c9b 100644 --- a/test/tap/tests/admin_various_commands-t.cpp +++ b/test/tap/tests/admin_various_commands-t.cpp @@ -7,7 +7,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/admin_various_commands2-t.cpp b/test/tap/tests/admin_various_commands2-t.cpp index 526d8bb879..94081b1e67 100644 --- a/test/tap/tests/admin_various_commands2-t.cpp +++ b/test/tap/tests/admin_various_commands2-t.cpp @@ -7,7 +7,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/admin_various_commands3-t.cpp b/test/tap/tests/admin_various_commands3-t.cpp index 619a56e7b0..db86720d81 100644 --- a/test/tap/tests/admin_various_commands3-t.cpp +++ b/test/tap/tests/admin_various_commands3-t.cpp @@ -7,7 +7,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/firewall_commands1-t.cpp b/test/tap/tests/firewall_commands1-t.cpp index 6c4c783fc6..6aa56cf61d 100644 --- a/test/tap/tests/firewall_commands1-t.cpp +++ b/test/tap/tests/firewall_commands1-t.cpp @@ -7,7 +7,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/max_connections_ff-t.cpp b/test/tap/tests/max_connections_ff-t.cpp index 0dfe61f503..f85a66f330 100644 --- a/test/tap/tests/max_connections_ff-t.cpp +++ b/test/tap/tests/max_connections_ff-t.cpp @@ -25,7 +25,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "json.hpp" diff --git a/test/tap/tests/multiple_prepared_statements-t.cpp b/test/tap/tests/multiple_prepared_statements-t.cpp index 1497f85118..ea3bed6035 100644 --- a/test/tap/tests/multiple_prepared_statements-t.cpp +++ b/test/tap/tests/multiple_prepared_statements-t.cpp @@ -22,7 +22,7 @@ It stresses how proxysql managers prepared statements, specifically: #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "command_line.h" #include "proxysql_utils.h" diff --git a/test/tap/tests/mysql_hostgroup_attributes-servers_defaults-t.cpp b/test/tap/tests/mysql_hostgroup_attributes-servers_defaults-t.cpp index c0dcd1a38a..51d5300f96 100644 --- a/test/tap/tests/mysql_hostgroup_attributes-servers_defaults-t.cpp +++ b/test/tap/tests/mysql_hostgroup_attributes-servers_defaults-t.cpp @@ -16,7 +16,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "json.hpp" diff --git a/test/tap/tests/reg_test_1493-mixed_compression-t.cpp b/test/tap/tests/reg_test_1493-mixed_compression-t.cpp index 95d4c9b06c..473d3288cf 100644 --- a/test/tap/tests/reg_test_1493-mixed_compression-t.cpp +++ b/test/tap/tests/reg_test_1493-mixed_compression-t.cpp @@ -9,7 +9,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/reg_test_2793-compression-t.cpp b/test/tap/tests/reg_test_2793-compression-t.cpp index f0780da770..7256094746 100644 --- a/test/tap/tests/reg_test_2793-compression-t.cpp +++ b/test/tap/tests/reg_test_2793-compression-t.cpp @@ -8,7 +8,7 @@ #include #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/reg_test_3223-restapi_return_codes-t.cpp b/test/tap/tests/reg_test_3223-restapi_return_codes-t.cpp index 440e5c64f9..6eac9c9d73 100644 --- a/test/tap/tests/reg_test_3223-restapi_return_codes-t.cpp +++ b/test/tap/tests/reg_test_3223-restapi_return_codes-t.cpp @@ -18,7 +18,7 @@ #include "curl/curl.h" #include "json.hpp" #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "command_line.h" #include "proxysql_utils.h" diff --git a/test/tap/tests/reg_test_3247-mycli_support-t.cpp b/test/tap/tests/reg_test_3247-mycli_support-t.cpp index 86fd06cb81..4116bd621d 100644 --- a/test/tap/tests/reg_test_3247-mycli_support-t.cpp +++ b/test/tap/tests/reg_test_3247-mycli_support-t.cpp @@ -9,7 +9,7 @@ #include #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/reg_test_3427-stmt_first_comment1-param-t.cpp b/test/tap/tests/reg_test_3427-stmt_first_comment1-param-t.cpp index 9b87053899..dadb3aa7d1 100644 --- a/test/tap/tests/reg_test_3427-stmt_first_comment1-param-t.cpp +++ b/test/tap/tests/reg_test_3427-stmt_first_comment1-param-t.cpp @@ -30,7 +30,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" #include "tap.h" diff --git a/test/tap/tests/reg_test_3427-stmt_first_comment1-t.cpp b/test/tap/tests/reg_test_3427-stmt_first_comment1-t.cpp index 9b87053899..dadb3aa7d1 100644 --- a/test/tap/tests/reg_test_3427-stmt_first_comment1-t.cpp +++ b/test/tap/tests/reg_test_3427-stmt_first_comment1-t.cpp @@ -30,7 +30,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" #include "tap.h" diff --git a/test/tap/tests/reg_test_3427-stmt_first_comment2-param-t.cpp b/test/tap/tests/reg_test_3427-stmt_first_comment2-param-t.cpp index 9b87053899..dadb3aa7d1 100644 --- a/test/tap/tests/reg_test_3427-stmt_first_comment2-param-t.cpp +++ b/test/tap/tests/reg_test_3427-stmt_first_comment2-param-t.cpp @@ -30,7 +30,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" #include "tap.h" diff --git a/test/tap/tests/reg_test_3427-stmt_first_comment2-t.cpp b/test/tap/tests/reg_test_3427-stmt_first_comment2-t.cpp index 9b87053899..dadb3aa7d1 100644 --- a/test/tap/tests/reg_test_3427-stmt_first_comment2-t.cpp +++ b/test/tap/tests/reg_test_3427-stmt_first_comment2-t.cpp @@ -30,7 +30,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" #include "tap.h" diff --git a/test/tap/tests/reg_test_3504-change_user-t.cpp b/test/tap/tests/reg_test_3504-change_user-t.cpp index 6c362c7218..3e839ee804 100644 --- a/test/tap/tests/reg_test_3504-change_user-t.cpp +++ b/test/tap/tests/reg_test_3504-change_user-t.cpp @@ -22,7 +22,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "command_line.h" #include "proxysql_utils.h" diff --git a/test/tap/tests/reg_test_3504-change_user_helper.cpp b/test/tap/tests/reg_test_3504-change_user_helper.cpp index 07019dca39..ee6ba80dbb 100644 --- a/test/tap/tests/reg_test_3504-change_user_helper.cpp +++ b/test/tap/tests/reg_test_3504-change_user_helper.cpp @@ -32,7 +32,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" #include "json.hpp" diff --git a/test/tap/tests/reg_test_3546-stmt_empty_params-t.cpp b/test/tap/tests/reg_test_3546-stmt_empty_params-t.cpp index 53b8431f01..86a148cd4f 100644 --- a/test/tap/tests/reg_test_3546-stmt_empty_params-t.cpp +++ b/test/tap/tests/reg_test_3546-stmt_empty_params-t.cpp @@ -21,7 +21,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" #include "tap.h" diff --git a/test/tap/tests/reg_test_3606-mysql_warnings-t.cpp b/test/tap/tests/reg_test_3606-mysql_warnings-t.cpp index 561da5508f..fdf93f2702 100644 --- a/test/tap/tests/reg_test_3606-mysql_warnings-t.cpp +++ b/test/tap/tests/reg_test_3606-mysql_warnings-t.cpp @@ -19,7 +19,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" diff --git a/test/tap/tests/reg_test_3625-sqlite3_session_client_error_limit-t.cpp b/test/tap/tests/reg_test_3625-sqlite3_session_client_error_limit-t.cpp index 00ad27d64a..05a2e08e47 100644 --- a/test/tap/tests/reg_test_3625-sqlite3_session_client_error_limit-t.cpp +++ b/test/tap/tests/reg_test_3625-sqlite3_session_client_error_limit-t.cpp @@ -16,7 +16,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/reg_test_3838-restapi_eintr-t.cpp b/test/tap/tests/reg_test_3838-restapi_eintr-t.cpp index 79379863d6..b890a43d8c 100644 --- a/test/tap/tests/reg_test_3838-restapi_eintr-t.cpp +++ b/test/tap/tests/reg_test_3838-restapi_eintr-t.cpp @@ -23,7 +23,7 @@ #include "curl/curl.h" #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "json.hpp" #include "tap.h" diff --git a/test/tap/tests/reg_test_3847_admin_lock-t.cpp b/test/tap/tests/reg_test_3847_admin_lock-t.cpp index 683527dfa8..e110a7874b 100644 --- a/test/tap/tests/reg_test_3847_admin_lock-t.cpp +++ b/test/tap/tests/reg_test_3847_admin_lock-t.cpp @@ -11,7 +11,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" #include "tap.h" diff --git a/test/tap/tests/reg_test_4072-show-warnings-t.cpp b/test/tap/tests/reg_test_4072-show-warnings-t.cpp index 2ef153da3f..3e22e70e19 100644 --- a/test/tap/tests/reg_test_4072-show-warnings-t.cpp +++ b/test/tap/tests/reg_test_4072-show-warnings-t.cpp @@ -8,7 +8,7 @@ #include #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" #include "utils.h" diff --git a/test/tap/tests/reg_test_4264-commit_rollback-t.cpp b/test/tap/tests/reg_test_4264-commit_rollback-t.cpp index ebf6246e46..1c5c6585ab 100644 --- a/test/tap/tests/reg_test_4264-commit_rollback-t.cpp +++ b/test/tap/tests/reg_test_4264-commit_rollback-t.cpp @@ -42,7 +42,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "utils.h" diff --git a/test/tap/tests/reg_test_4300-dollar_quote_check-t.cpp b/test/tap/tests/reg_test_4300-dollar_quote_check-t.cpp index 24e27c3ce6..9e6828e621 100644 --- a/test/tap/tests/reg_test_4300-dollar_quote_check-t.cpp +++ b/test/tap/tests/reg_test_4300-dollar_quote_check-t.cpp @@ -16,7 +16,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "utils.h" diff --git a/test/tap/tests/reg_test_sql_calc_found_rows-t.cpp b/test/tap/tests/reg_test_sql_calc_found_rows-t.cpp index 1bf13fc430..674a1f9b74 100644 --- a/test/tap/tests/reg_test_sql_calc_found_rows-t.cpp +++ b/test/tap/tests/reg_test_sql_calc_found_rows-t.cpp @@ -13,7 +13,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "json.hpp" diff --git a/test/tap/tests/reg_test_stmt_resultset_err_no_rows-t.cpp b/test/tap/tests/reg_test_stmt_resultset_err_no_rows-t.cpp index a84e82283b..f02fc7fd95 100644 --- a/test/tap/tests/reg_test_stmt_resultset_err_no_rows-t.cpp +++ b/test/tap/tests/reg_test_stmt_resultset_err_no_rows-t.cpp @@ -17,7 +17,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" #include "tap.h" @@ -140,9 +140,9 @@ int main(int argc, char** argv) { bind.buffer_type = MYSQL_TYPE_STRING; bind.buffer = (char *)&data_c2; bind.buffer_length = STRING_SIZE; - bind.is_null = &is_null[0]; + bind.is_null = (my_bool *)&is_null[0]; bind.length = &length[0]; - bind.error = &error[0]; + bind.error = (my_bool *)&error[0]; if (mysql_stmt_bind_result(stmt, &bind)) { diag("mysql_stmt_bind_result at line %d failed: %s", __LINE__, mysql_stmt_error(stmt)); diff --git a/test/tap/tests/reg_test_stmt_resultset_err_no_rows_php-t.cpp b/test/tap/tests/reg_test_stmt_resultset_err_no_rows_php-t.cpp index 78c9330f17..bd7a0cf19d 100644 --- a/test/tap/tests/reg_test_stmt_resultset_err_no_rows_php-t.cpp +++ b/test/tap/tests/reg_test_stmt_resultset_err_no_rows_php-t.cpp @@ -9,7 +9,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" #include "tap.h" diff --git a/test/tap/tests/test_admin_prometheus_metrics_dump-t_disabled_gh3571.cpp b/test/tap/tests/test_admin_prometheus_metrics_dump-t_disabled_gh3571.cpp index 08115a0010..f979b772e0 100644 --- a/test/tap/tests/test_admin_prometheus_metrics_dump-t_disabled_gh3571.cpp +++ b/test/tap/tests/test_admin_prometheus_metrics_dump-t_disabled_gh3571.cpp @@ -11,7 +11,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_admin_stats-t.cpp b/test/tap/tests/test_admin_stats-t.cpp index 56a933d483..29ac4d0e40 100644 --- a/test/tap/tests/test_admin_stats-t.cpp +++ b/test/tap/tests/test_admin_stats-t.cpp @@ -28,7 +28,7 @@ DELETE FROM history_mysql_status_variables; #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_auto_increment_delay_multiplex-t.cpp b/test/tap/tests/test_auto_increment_delay_multiplex-t.cpp index b2d18a0d83..ee50da7211 100644 --- a/test/tap/tests/test_auto_increment_delay_multiplex-t.cpp +++ b/test/tap/tests/test_auto_increment_delay_multiplex-t.cpp @@ -29,7 +29,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "json.hpp" diff --git a/test/tap/tests/test_binlog_reader-t.cpp b/test/tap/tests/test_binlog_reader-t.cpp index 6ceb8d15b1..82eaf7f619 100644 --- a/test/tap/tests/test_binlog_reader-t.cpp +++ b/test/tap/tests/test_binlog_reader-t.cpp @@ -29,7 +29,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include #include "tap.h" diff --git a/test/tap/tests/test_clickhouse_server-t.cpp b/test/tap/tests/test_clickhouse_server-t.cpp index 940671a520..d943442e97 100644 --- a/test/tap/tests/test_clickhouse_server-t.cpp +++ b/test/tap/tests/test_clickhouse_server-t.cpp @@ -29,7 +29,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_com_reset_connection_com_change_user-t.cpp b/test/tap/tests/test_com_reset_connection_com_change_user-t.cpp index fe5fd698ae..ed81bd5abb 100644 --- a/test/tap/tests/test_com_reset_connection_com_change_user-t.cpp +++ b/test/tap/tests/test_com_reset_connection_com_change_user-t.cpp @@ -20,7 +20,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "command_line.h" #include "proxysql_utils.h" diff --git a/test/tap/tests/test_connection_annotation-t.cpp b/test/tap/tests/test_connection_annotation-t.cpp index c04544a1af..915e20c122 100644 --- a/test/tap/tests/test_connection_annotation-t.cpp +++ b/test/tap/tests/test_connection_annotation-t.cpp @@ -11,7 +11,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_default_conn_collation-t.cpp b/test/tap/tests/test_default_conn_collation-t.cpp index fa8a29ef8d..a130ac1307 100644 --- a/test/tap/tests/test_default_conn_collation-t.cpp +++ b/test/tap/tests/test_default_conn_collation-t.cpp @@ -10,7 +10,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "utils.h" diff --git a/test/tap/tests/test_dns_cache-t.cpp b/test/tap/tests/test_dns_cache-t.cpp index 213e9751f3..652efa2425 100644 --- a/test/tap/tests/test_dns_cache-t.cpp +++ b/test/tap/tests/test_dns_cache-t.cpp @@ -15,7 +15,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_gtid_forwarding-t.cpp b/test/tap/tests/test_gtid_forwarding-t.cpp index 5ac70f80c9..dddc65206a 100644 --- a/test/tap/tests/test_gtid_forwarding-t.cpp +++ b/test/tap/tests/test_gtid_forwarding-t.cpp @@ -15,7 +15,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_log_last_insert_id-t.cpp b/test/tap/tests/test_log_last_insert_id-t.cpp index 883c8bdc05..2443a85d1d 100644 --- a/test/tap/tests/test_log_last_insert_id-t.cpp +++ b/test/tap/tests/test_log_last_insert_id-t.cpp @@ -8,7 +8,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_mysql_connect_retries_delay-t.cpp b/test/tap/tests/test_mysql_connect_retries_delay-t.cpp index 5d5bf8dcaf..014c2eff6b 100644 --- a/test/tap/tests/test_mysql_connect_retries_delay-t.cpp +++ b/test/tap/tests/test_mysql_connect_retries_delay-t.cpp @@ -19,7 +19,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_mysqlsh-t.cpp b/test/tap/tests/test_mysqlsh-t.cpp index 309ea8fb3e..a809b172b5 100644 --- a/test/tap/tests/test_mysqlsh-t.cpp +++ b/test/tap/tests/test_mysqlsh-t.cpp @@ -9,7 +9,7 @@ #include #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_prometheus_metrics-t.cpp b/test/tap/tests/test_prometheus_metrics-t.cpp index 3df50999bf..a9bc27df6a 100644 --- a/test/tap/tests/test_prometheus_metrics-t.cpp +++ b/test/tap/tests/test_prometheus_metrics-t.cpp @@ -17,7 +17,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "json.hpp" #include "tap.h" diff --git a/test/tap/tests/test_query_rules_fast_routing_algorithm-t.cpp b/test/tap/tests/test_query_rules_fast_routing_algorithm-t.cpp index e7a3cdec7e..81b8c39ee4 100644 --- a/test/tap/tests/test_query_rules_fast_routing_algorithm-t.cpp +++ b/test/tap/tests/test_query_rules_fast_routing_algorithm-t.cpp @@ -14,7 +14,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "utils.h" diff --git a/test/tap/tests/test_query_rules_routing-t.cpp b/test/tap/tests/test_query_rules_routing-t.cpp index 521308335d..792ef90ae9 100644 --- a/test/tap/tests/test_query_rules_routing-t.cpp +++ b/test/tap/tests/test_query_rules_routing-t.cpp @@ -20,7 +20,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "command_line.h" #include "proxysql_utils.h" diff --git a/test/tap/tests/test_rw_binary_data-t.cpp b/test/tap/tests/test_rw_binary_data-t.cpp index ec861d4d30..748d62aedd 100644 --- a/test/tap/tests/test_rw_binary_data-t.cpp +++ b/test/tap/tests/test_rw_binary_data-t.cpp @@ -25,7 +25,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "command_line.h" #include "proxysql_utils.h" diff --git a/test/tap/tests/test_simple_embedded_HTTP_server-t.cpp b/test/tap/tests/test_simple_embedded_HTTP_server-t.cpp index bc2402ce20..4f2860a729 100644 --- a/test/tap/tests/test_simple_embedded_HTTP_server-t.cpp +++ b/test/tap/tests/test_simple_embedded_HTTP_server-t.cpp @@ -9,7 +9,7 @@ #include "curl/curl.h" #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_sqlite3_server-t.cpp b/test/tap/tests/test_sqlite3_server-t.cpp index e1d1bb7528..a9e2b06f93 100644 --- a/test/tap/tests/test_sqlite3_server-t.cpp +++ b/test/tap/tests/test_sqlite3_server-t.cpp @@ -36,7 +36,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_sqlite3_server_and_fast_routing-t.cpp b/test/tap/tests/test_sqlite3_server_and_fast_routing-t.cpp index bda4c57a9d..c53732373d 100644 --- a/test/tap/tests/test_sqlite3_server_and_fast_routing-t.cpp +++ b/test/tap/tests/test_sqlite3_server_and_fast_routing-t.cpp @@ -8,7 +8,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_ssl_connect-t.cpp b/test/tap/tests/test_ssl_connect-t.cpp index 08def17dae..daa9d02f66 100644 --- a/test/tap/tests/test_ssl_connect-t.cpp +++ b/test/tap/tests/test_ssl_connect-t.cpp @@ -7,7 +7,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_stats_proxysql_message_metrics-t.cpp b/test/tap/tests/test_stats_proxysql_message_metrics-t.cpp index 43a9a9db4d..8970596977 100644 --- a/test/tap/tests/test_stats_proxysql_message_metrics-t.cpp +++ b/test/tap/tests/test_stats_proxysql_message_metrics-t.cpp @@ -9,7 +9,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "tap.h" #include "utils.h" diff --git a/test/tap/tests/test_unshun_algorithm-t.cpp b/test/tap/tests/test_unshun_algorithm-t.cpp index e17f0b3ca8..4a5714eaaf 100644 --- a/test/tap/tests/test_unshun_algorithm-t.cpp +++ b/test/tap/tests/test_unshun_algorithm-t.cpp @@ -64,7 +64,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" #include "tap.h" diff --git a/test/tap/tests/test_unsupported_queries-t.cpp b/test/tap/tests/test_unsupported_queries-t.cpp index 1fe705474a..07afbb7884 100644 --- a/test/tap/tests/test_unsupported_queries-t.cpp +++ b/test/tap/tests/test_unsupported_queries-t.cpp @@ -13,7 +13,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "command_line.h" #include "json.hpp" diff --git a/test/tap/tests_with_deps/deprecate_eof_support/deprecate_eof_cache-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/deprecate_eof_cache-t.cpp index 890a94ac01..c084fce131 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/deprecate_eof_cache-t.cpp +++ b/test/tap/tests_with_deps/deprecate_eof_support/deprecate_eof_cache-t.cpp @@ -8,7 +8,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" diff --git a/test/tap/tests_with_deps/deprecate_eof_support/eof_cache_mixed_flags-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/eof_cache_mixed_flags-t.cpp index 22f6ee9ffc..f7f95a694d 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/eof_cache_mixed_flags-t.cpp +++ b/test/tap/tests_with_deps/deprecate_eof_support/eof_cache_mixed_flags-t.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests_with_deps/deprecate_eof_support/eof_conn_options_check-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/eof_conn_options_check-t.cpp index 1ce8454e9f..bbc19ec43a 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/eof_conn_options_check-t.cpp +++ b/test/tap/tests_with_deps/deprecate_eof_support/eof_conn_options_check-t.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include "mysqld_error.h" #include "json.hpp" #include "tap.h" diff --git a/test/tap/tests_with_deps/deprecate_eof_support/eof_fast_forward-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/eof_fast_forward-t.cpp index 9aa1088159..f0bbf46613 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/eof_fast_forward-t.cpp +++ b/test/tap/tests_with_deps/deprecate_eof_support/eof_fast_forward-t.cpp @@ -18,7 +18,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" diff --git a/test/tap/tests_with_deps/deprecate_eof_support/eof_mixed_flags_queries-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/eof_mixed_flags_queries-t.cpp index d860ed25c3..2222e6a19c 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/eof_mixed_flags_queries-t.cpp +++ b/test/tap/tests_with_deps/deprecate_eof_support/eof_mixed_flags_queries-t.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include "mysqld_error.h" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests_with_deps/deprecate_eof_support/eof_packet_mixed_queries-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/eof_packet_mixed_queries-t.cpp index 2b49c9a2ef..42f2826f0d 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/eof_packet_mixed_queries-t.cpp +++ b/test/tap/tests_with_deps/deprecate_eof_support/eof_packet_mixed_queries-t.cpp @@ -19,7 +19,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h" diff --git a/test/tap/tests_with_deps/deprecate_eof_support/fwd_eof_query.cpp b/test/tap/tests_with_deps/deprecate_eof_support/fwd_eof_query.cpp index 15261042fc..5eb35f4c61 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/fwd_eof_query.cpp +++ b/test/tap/tests_with_deps/deprecate_eof_support/fwd_eof_query.cpp @@ -6,7 +6,7 @@ #include #include "mysql.h" -#include "mysql/mysqld_error.h" +#include "mysqld_error.h" #include "proxysql_utils.h"