aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3445 from sysown/v2.2.0-opt2

Browse Source 
Code cleanup for MySQL variables
pull/3451/head
René Cannaò 5 years ago committed by GitHub
parent d3c243d898 218bfa8739
commit a2c82bd95a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 353 additions and 1834 deletions
Show Stats Download Patch File Download Diff File

17
include/MySQL_Thread.h
Unescape View File

@ -368,6 +368,20 @@ class MySQL_Threads_Handler
pthread_rwlock_t rwlock;
PtrArray *bind_fds;
MySQL_Listeners_Manager *MLM;
// VariablesPointers_int stores:
// key: variable name
// tuple:
// variable address
// min value
// max value
// special variable : if true, min and max values are ignored, and further input validation is required
std::unordered_map<std::string, std::tuple<int *, int, int, bool>> VariablesPointers_int;
// VariablesPointers_bool stores:
// key: variable name
// tuple:
// variable address
// special variable : if true, further input validation is required
std::unordered_map<std::string, std::tuple<bool *, bool>> VariablesPointers_bool;
public:
struct {
int monitor_history;
@ -434,7 +448,7 @@ class MySQL_Threads_Handler
char *server_version;
char *keep_multiplexing_variables;
//unsigned int default_charset; // removed in 2.0.13 . Obsoleted previously using MySQL_Variables instead
unsigned int handle_unknown_charset;
int handle_unknown_charset;
bool servers_stats;
bool commands_stats;
bool query_digests;
@ -552,7 +566,6 @@ class MySQL_Threads_Handler
~MySQL_Threads_Handler();
char *get_variable_string(char *name);
unsigned int get_variable_uint(char *name);
uint16_t get_variable_uint16(char *name);
int get_variable_int(const char *name);
void print_version();

4
include/proxysql_structs.h
Unescape View File

@ -758,7 +758,7 @@ __thread int mysql_thread___set_query_lock_on_hostgroup;
__thread int mysql_thread___reset_connection_algorithm;
__thread uint32_t mysql_thread___server_capabilities;
__thread int mysql_thread___auto_increment_delay_multiplex;
__thread unsigned int mysql_thread___handle_unknown_charset;
__thread int mysql_thread___handle_unknown_charset;
__thread int mysql_thread___poll_timeout;
__thread int mysql_thread___poll_timeout_on_failure;
__thread bool mysql_thread___connection_warming;
@ -909,7 +909,7 @@ extern __thread int mysql_thread___set_query_lock_on_hostgroup;
extern __thread int mysql_thread___reset_connection_algorithm;
extern __thread uint32_t mysql_thread___server_capabilities;
extern __thread int mysql_thread___auto_increment_delay_multiplex;
extern __thread unsigned int mysql_thread___handle_unknown_charset;
extern __thread int mysql_thread___handle_unknown_charset;
extern __thread int mysql_thread___poll_timeout;
extern __thread int mysql_thread___poll_timeout_on_failure;
extern __thread bool mysql_thread___connection_warming;

2160
lib/MySQL_Thread.cpp
View File

File diff suppressed because it is too large Load Diff

6
test/tap/tests/test_cluster_sync-t.cpp
Unescape View File

@ -975,9 +975,9 @@ int main(int, char**) {
std::make_tuple("mysql-monitor_writer_is_also_reader" , "true" ),
std::make_tuple("mysql-max_allowed_packet" , "67108864" ),
std::make_tuple("mysql-tcp_keepalive_time" , "0" ),
std::make_tuple("mysql-use_tcp_keepalive" , "0" ),
std::make_tuple("mysql-automatic_detect_sqli" , "0" ),
std::make_tuple("mysql-firewall_whitelist_enabled" , "0" ),
std::make_tuple("mysql-use_tcp_keepalive" , "false" ),
std::make_tuple("mysql-automatic_detect_sqli" , "false" ),
std::make_tuple("mysql-firewall_whitelist_enabled" , "false" ),
std::make_tuple("mysql-firewall_whitelist_errormsg" , "Firewall blocked this query"),
std::make_tuple("mysql-throttle_connections_per_sec_to_hostgroup" , "1000001" ),
std::make_tuple("mysql-max_transaction_time" , "14400001" ),

Write Preview
Loading…
Cancel
Save