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

Modify validate_charset to ignore unset variables

Browse Source
pull/2895/head
René Cannaò 6 years ago
parent b1ed1f57e4
commit fe503cfcae
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File

12
lib/MySQL_Variables.cpp
Unescape View File

@ -243,7 +243,11 @@ bool validate_charset(MySQL_Session* session, int idx, int &_rc) {
if (idx == SQL_COLLATION_CONNECTION) {
ci = proxysql_find_charset_collate(mysql_thread___default_variables[idx]);
} else {
ci = proxysql_find_charset_name(mysql_thread___default_variables[idx]);
if (mysql_thread___default_variables[idx]) {
ci = proxysql_find_charset_name(mysql_thread___default_variables[idx]);
} else {
ci = proxysql_find_charset_name(mysql_thread___default_variables[SQL_CHARACTER_SET]);
}
}
if (!ci) {
@ -265,7 +269,11 @@ bool validate_charset(MySQL_Session* session, int idx, int &_rc) {
if (idx == SQL_COLLATION_CONNECTION) {
ci = proxysql_find_charset_collate(mysql_thread___default_variables[idx]);
} else {
ci = proxysql_find_charset_name(mysql_thread___default_variables[idx]);
if (mysql_thread___default_variables[idx]) {
ci = proxysql_find_charset_name(mysql_thread___default_variables[idx]);
} else {
ci = proxysql_find_charset_name(mysql_thread___default_variables[SQL_CHARACTER_SET]);
}
}
if (!ci) {

Write Preview
Loading…
Cancel
Save