fix mysql includes

sysown · Oct 31, 2023 · b939609 · b939609
1 parent 01586df
commit b939609
Show file tree

Hide file tree

Showing 63 changed files with 65 additions and 65 deletions.
diff --git 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 <stdio.h>
 
 #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
@@ -7,7 +7,7 @@
 #include <tuple>
 
 #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
@@ -7,7 +7,7 @@
 #include <tuple>
 
 #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
@@ -7,7 +7,7 @@
 #include <tuple>
 
 #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
@@ -7,7 +7,7 @@
 #include <tuple>
 
 #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
@@ -7,7 +7,7 @@
 #include <tuple>
 
 #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
@@ -7,7 +7,7 @@
 #include <tuple>
 
 #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
@@ -7,7 +7,7 @@
 #include <tuple>
 
 #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
@@ -25,7 +25,7 @@
 #include <unistd.h>
 
 #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
@@ -22,7 +22,7 @@ It stresses how proxysql managers prepared statements, specifically:
 #include <unistd.h>
 
 #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
@@ -16,7 +16,7 @@
 #include <unistd.h>
 
 #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
@@ -9,7 +9,7 @@
 #include <stdio.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/reg_test_2793-compression-t.cpp b/test/tap/tests/reg_test_2793-compression-t.cpp
@@ -8,7 +8,7 @@
 #include <string>
 #include <stdio.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/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
@@ -9,7 +9,7 @@
 #include <sstream>
 #include <stdio.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/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 <stdio.h>
 
 #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
@@ -30,7 +30,7 @@
 #include <stdio.h>
 
 #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
@@ -30,7 +30,7 @@
 #include <stdio.h>
 
 #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
@@ -30,7 +30,7 @@
 #include <stdio.h>
 
 #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
@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #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
@@ -32,7 +32,7 @@
 #include <iostream>
 
 #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
@@ -21,7 +21,7 @@
 #include <stdio.h>
 
 #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
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #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
@@ -16,7 +16,7 @@
 #include <unistd.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/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
@@ -11,7 +11,7 @@
 #include <unistd.h>
 
 #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
@@ -8,7 +8,7 @@
 #include <string>
 #include <thread>
 #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
@@ -42,7 +42,7 @@
 #include <unistd.h>
 
 #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
@@ -16,7 +16,7 @@
 #include <unistd.h>
 
 #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
@@ -13,7 +13,7 @@
 #include <unistd.h>
 
 #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
@@ -17,7 +17,7 @@
 #include <vector>
 
 #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
@@ -9,7 +9,7 @@
 #include <vector>
 
 #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
@@ -11,7 +11,7 @@
 #include <vector>
 
 #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
@@ -28,7 +28,7 @@ DELETE FROM history_mysql_status_variables;
 #include <vector>
 
 #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
@@ -29,7 +29,7 @@
 
 #include <unistd.h>
 #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
@@ -29,7 +29,7 @@
 #include <vector>
 
 #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_clickhouse_server-t.cpp b/test/tap/tests/test_clickhouse_server-t.cpp
@@ -29,7 +29,7 @@
 #include <unistd.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_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 <unistd.h>
 
 #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
@@ -11,7 +11,7 @@
 #include <stdio.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_default_conn_collation-t.cpp b/test/tap/tests/test_default_conn_collation-t.cpp
@@ -10,7 +10,7 @@
 #include <string>
 
 #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
@@ -15,7 +15,7 @@
 #include <thread>
 
 #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
@@ -15,7 +15,7 @@
 #include <string.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_log_last_insert_id-t.cpp b/test/tap/tests/test_log_last_insert_id-t.cpp
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include "mysql.h"
-#include "mysql/mysqld_error.h"
+#include "mysqld_error.h"
 
 #include "tap.h"
 #include "command_line.h"