summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index dad15c98920..01f754955b6 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -75,6 +75,7 @@
#include "wsrep_var.h"
#include "wsrep_thd.h"
#include "wsrep_sst.h"
+#include "proxy_protocol.h"
#include "sql_callback.h"
#include "threadpool.h"
@@ -2286,6 +2287,7 @@ void clean_up(bool print_message)
my_free(const_cast<char*>(relay_log_index));
#endif
free_list(opt_plugin_load_list_ptr);
+ cleanup_proxy_protocol_networks();
/*
The following lines may never be executed as the main thread may have
@@ -2682,6 +2684,9 @@ static void network_init(void)
if (MYSQL_CALLBACK_ELSE(thread_scheduler, init, (), 0))
unireg_abort(1); /* purecov: inspected */
+ if (set_proxy_protocol_networks(my_proxy_protocol_networks))
+ unireg_abort(1);
+
set_ports();
if (report_port == 0)