Removed 'PROXYSQL_MONITOR_ERR' enum in favor of single enum 'PROXYSQL_MYSQL_ERR' holding all ProxySQL errors for backend connections

include/MySQL_Monitor.hpp

@@ -52,25 +52,6 @@ struct cmp_str {
 
 #define N_L_ASE 16
 
-/**
- * Enum holding the different connection errors that could be reached for
- * the backend connections oppened by 'MySQL_Monitor' module.
- */
-enum PROXYSQL_MONITOR_ERR {
-	ER_PROXYSQL_GR_HEALTH_CHECK_TIMEOUT                    = 10000,
-	ER_PROXYSQL_GR_HEALTH_CHECKS_MISSED                    = 10001,
-	ER_PROXYSQL_READ_ONLY_CHECK_CONN_TIMEOUT               = 10002,
-	ER_PROXYSQL_READ_ONLY_CHECK_TIMEOUT                    = 10003,
-	ER_PROXYSQL_READ_ONLY_CHECKS_MISSED                    = 10004,
-	ER_PROXYSQL_GALERA_HEALTH_CHECK_CONN_TIMEOUT           = 10005,
-	ER_PROXYSQL_GALERA_HEALTH_CHECK_TIMEOUT                = 10006,
-	ER_PROXYSQL_GALERA_HEALTH_CHECKS_MISSED                = 10007,
-	ER_PROXYSQL_AWS_NO_PINGABLE_SRV                        = 10008,
-	ER_PROXYSQL_AWS_HEALTH_CHECK_CONN_TIMEOUT              = 10009,
-	ER_PROXYSQL_AWS_HEALTH_CHECK_TIMEOUT                   = 10010,
-	ER_PROXYSQL_SRV_NULL_REPLICATION_LAG                   = 10011,
-};
-
 /*
 
 Implementation of monitoring in AWS Aurora will be different than previous modules

include/MySQL_Protocol.h

@@ -7,17 +7,6 @@
 
 #define RESULTSET_BUFLEN 16300
 
-/**
- * Enum holding the different MySQL connection errors that are used to report
- * invalid states in the backend connections.
- */
-enum PROXYSQL_MYSQL_ERR {
-	ER_PROXYSQL_OFFLINE_SRV                      = 9004,
-	ER_PROXYSQL_LAGGING_SRV                      = 9005,
-	ER_PROXYSQL_PING_TIMEOUT                     = 9006,
-	ER_PROXYSQL_CHANGE_USER_TIMEOUT              = 9007,
-};
-
 extern MySQL_Variables mysql_variables;
 
 /* The default mariadb-connecter 3.1.4 does not yet implement CLIENT_DEPRECATE_EOF

include/proxysql_structs.h

@@ -383,6 +383,32 @@ enum handle_unknown_charset {
 	HANDLE_UNKNOWN_CHARSET__MAX_HANDLE_VALUE
 };
 
+/**
+ * Enum holding the different MySQL connection errors that are used to report
+ * invalid states in the backend connections.
+ */
+enum PROXYSQL_MYSQL_ERR {
+	ER_PROXYSQL_MAX_CONN_TIMEOUT                      = 9001,
+	ER_PROXYSQL_MAX_CONN_FAILURES                     = 9002,
+	ER_PROXYSQL_COMMAND_NOT_SUPPORTED                 = 9003,
+	ER_PROXYSQL_OFFLINE_SRV                           = 9004,
+	ER_PROXYSQL_LAGGING_SRV                           = 9005,
+	ER_PROXYSQL_PING_TIMEOUT                          = 9006,
+	ER_PROXYSQL_CHANGE_USER_TIMEOUT                   = 9007,
+	ER_PROXYSQL_GR_HEALTH_CHECK_TIMEOUT               = 9008,
+	ER_PROXYSQL_GR_HEALTH_CHECKS_MISSED               = 9009,
+	ER_PROXYSQL_READ_ONLY_CHECK_CONN_TIMEOUT          = 9010,
+	ER_PROXYSQL_READ_ONLY_CHECK_TIMEOUT               = 9011,
+	ER_PROXYSQL_READ_ONLY_CHECKS_MISSED               = 9012,
+	ER_PROXYSQL_GALERA_HEALTH_CHECK_CONN_TIMEOUT      = 9013,
+	ER_PROXYSQL_GALERA_HEALTH_CHECK_TIMEOUT           = 9014,
+	ER_PROXYSQL_GALERA_HEALTH_CHECKS_MISSED           = 9015,
+	ER_PROXYSQL_AWS_NO_PINGABLE_SRV                   = 9016,
+	ER_PROXYSQL_AWS_HEALTH_CHECK_CONN_TIMEOUT         = 9017,
+	ER_PROXYSQL_AWS_HEALTH_CHECK_TIMEOUT              = 9018,
+	ER_PROXYSQL_SRV_NULL_REPLICATION_LAG              = 9019,
+};
+
 #endif /* PROXYSQL_ENUMS */