use inludes from our deps intead of system

sysown · Oct 24, 2023 · 6c15528 · 6c15528
1 parent 9185c96
commit 6c15528
Show file tree

Hide file tree

Showing 139 changed files with 1,126 additions and 238 deletions.
diff --git a/include/proxysql_admin.h b/include/proxysql_admin.h
@@ -1,9 +1,9 @@
 #ifndef __CLASS_PROXYSQL_ADMIN_H
 #define __CLASS_PROXYSQL_ADMIN_H
 
-#include <prometheus/exposer.h>
-#include <prometheus/counter.h>
-#include <prometheus/gauge.h>
+#include "prometheus/exposer.h"
+#include "prometheus/counter.h"
+#include "prometheus/gauge.h"
 
 #include "query_processor.h"
 #include "proxy_defines.h"

diff --git a/include/proxysql_glovars.hpp b/include/proxysql_glovars.hpp
@@ -5,7 +5,7 @@
 #define CLUSTER_SYNC_INTERFACES_MYSQL "('mysql-interfaces')"
 
 #include <memory>
-#include <prometheus/registry.h>
+#include "prometheus/registry.h"
 
 #include "configfile.hpp"
 #include "proxy_defines.h"

diff --git a/test/tap/tests/admin-listen_on_unix-t.cpp b/test/tap/tests/admin-listen_on_unix-t.cpp
@@ -4,8 +4,8 @@
 #include <string>
 #include <stdio.h>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/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
@@ -6,8 +6,8 @@
 #include <vector>
 #include <tuple>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/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
@@ -6,8 +6,8 @@
 #include <vector>
 #include <tuple>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/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
@@ -6,8 +6,8 @@
 #include <vector>
 #include <tuple>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/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
@@ -6,8 +6,8 @@
 #include <vector>
 #include <tuple>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/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
@@ -6,8 +6,8 @@
 #include <vector>
 #include <tuple>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/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
@@ -6,8 +6,8 @@
 #include <vector>
 #include <tuple>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/mysqld_error.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/charset_unsigned_int-t.cpp b/test/tap/tests/charset_unsigned_int-t.cpp
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 #include <string>
-#include <mysql.h>
+#include "mysql.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
@@ -6,8 +6,8 @@
 #include <vector>
 #include <tuple>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/mysqld_error.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/kill_connection-t.cpp b/test/tap/tests/kill_connection-t.cpp
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <cstring>
 #include <unistd.h>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/kill_connection2-t.cpp b/test/tap/tests/kill_connection2-t.cpp
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <cstring>
 #include <unistd.h>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/kill_connection3-t.cpp b/test/tap/tests/kill_connection3-t.cpp
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <cstring>
 #include <unistd.h>
-#include <mysql.h>
+#include "mysql.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
@@ -24,8 +24,8 @@
 #include <vector>
 #include <unistd.h>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/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
@@ -21,8 +21,8 @@ It stresses how proxysql managers prepared statements, specifically:
 #include <tuple>
 #include <unistd.h>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/mysqld_error.h"
 
 #include "command_line.h"
 #include "proxysql_utils.h"

diff --git a/test/tap/tests/mysql-fast_forward-t.cpp b/test/tap/tests/mysql-fast_forward-t.cpp
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <cstring>
 #include <unistd.h>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/mysql-init_connect-1-t.cpp b/test/tap/tests/mysql-init_connect-1-t.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #include <sstream>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/mysql-init_connect-2-t.cpp b/test/tap/tests/mysql-init_connect-2-t.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #include <sstream>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/mysql-last_insert_id-t.cpp b/test/tap/tests/mysql-last_insert_id-t.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #include <sstream>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/mysql-mirror1-t.cpp b/test/tap/tests/mysql-mirror1-t.cpp
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <cstring>
 #include <unistd.h>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/mysql-set_transaction-t.cpp b/test/tap/tests/mysql-set_transaction-t.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #include <sstream>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/mysql-sql_log_bin-error-t.cpp b/test/tap/tests/mysql-sql_log_bin-error-t.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #include <sstream>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/mysql-test_ssl_CA-t.cpp b/test/tap/tests/mysql-test_ssl_CA-t.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #include <sstream>
-#include <mysql.h>
+#include "mysql.h"
 #include <dirent.h>
 
 #include "tap.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
@@ -15,8 +15,8 @@
 #include <fstream>
 #include <unistd.h>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/mysqld_error.h"
 
 #include "json.hpp"
 

diff --git a/test/tap/tests/mysql_stmt_send_long_data-t.cpp b/test/tap/tests/mysql_stmt_send_long_data-t.cpp
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <cstring>
 #include <unistd.h>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/mysql_stmt_send_long_data_large-t.cpp b/test/tap/tests/mysql_stmt_send_long_data_large-t.cpp
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <cstring>
 #include <unistd.h>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/prepare_statement_err3024-t.cpp b/test/tap/tests/prepare_statement_err3024-t.cpp
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <vector>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/reg_test_1493-mixed_compression-t.cpp b/test/tap/tests/reg_test_1493-mixed_compression-t.cpp
@@ -8,8 +8,8 @@
 #include <string>
 #include <stdio.h>
 
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/mysqld_error.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/reg_test_1574-mariadb_read_stmt_execute_response-t.cpp b/test/tap/tests/reg_test_1574-mariadb_read_stmt_execute_response-t.cpp
@@ -20,7 +20,7 @@
 #include <cstring>
 #include <unistd.h>
 
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/reg_test_1574-stmt_metadata-t.cpp b/test/tap/tests/reg_test_1574-stmt_metadata-t.cpp
@@ -21,7 +21,7 @@
 #include <time.h>
 #include <iostream>
 
-#include <mysql.h>
+#include "mysql.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
@@ -7,8 +7,8 @@
 #include <vector>
 #include <string>
 #include <stdio.h>
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/mysqld_error.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/reg_test_3184-set_wait_timeout-t.cpp b/test/tap/tests/reg_test_3184-set_wait_timeout-t.cpp
@@ -13,7 +13,7 @@
 #include <vector>
 #include <string>
 #include <stdio.h>
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.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
@@ -8,8 +8,8 @@
 #include <string>
 #include <sstream>
 #include <stdio.h>
-#include <mysql.h>
-#include <mysql/mysqld_error.h>
+#include "mysql.h"
+#include "mysql/mysqld_error.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/reg_test_3273_ssl_con-t.cpp b/test/tap/tests/reg_test_3273_ssl_con-t.cpp
@@ -28,7 +28,7 @@
 #include <poll.h>
 #include <sys/epoll.h>
 
-#include <mysql.h>
+#include "mysql.h"
 #include <thread>
 
 #include "tap.h"

diff --git a/test/tap/tests/reg_test_3317-lock_hostgroup_special_queries-t.cpp b/test/tap/tests/reg_test_3317-lock_hostgroup_special_queries-t.cpp
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <functional>
 
-#include <mysql.h>
+#include "mysql.h"
 
 #include "tap.h"
 #include "command_line.h"

diff --git a/test/tap/tests/reg_test_3327-process_query_set_status_flags-t.cpp b/test/tap/tests/reg_test_3327-process_query_set_status_flags-t.cpp
@@ -9,7 +9,7 @@
 #include <vector>
 #include <string>
 #include <stdio.h>
-#include <mysql.h>
+#include "mysql.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