hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from develop

Browse Source 
Merge from develop
This commit is contained in:
MassimilianoPinto
2014-10-20 09:03:11 +02:00
parent b8f590e67f 319dd4b3e6
commit c54e087d3e
8 changed files with 98 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/protocol/mysql_common.c
View File

@ -1111,21 +1111,21 @@ int gw_send_change_user_to_backend(
// add the user
bytes += strlen(user);
// the NULL
// NULL byte for user string
bytes++;
// next will be + 1 (scramble_len) + 20 (fixed_scramble) + (dbname + NULL term) + 2 bytes charset
if (curr_passwd != NULL) {
bytes += GW_MYSQL_SCRAMBLE_SIZE;
if (curr_passwd != NULL) {
bytes += GW_MYSQL_SCRAMBLE_SIZE;
}
// the NULL
// 1 byte for scramble_len
bytes++;
if (curr_db != NULL) {
bytes += strlen(curr_db);
if (curr_db != NULL) {
bytes += strlen(curr_db);
}
// the NULL
// NULL byte for dbname string
bytes++;
// the charset

36
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -2696,34 +2696,38 @@ static bool select_connect_backend_servers(
switch(select_criteria) {
case LEAST_GLOBAL_CONNECTIONS:
LOGIF(LT, (skygw_log_write_flush(LOGFILE_TRACE,
"%s:%d MaxScale connections : %d",
b->backend_server->name,
b->backend_server->port,
b->backend_server->stats.n_current)));
"MaxScale connections : %d in \t%s:%d %s",
b->backend_server->stats.n_current,
b->backend_server->name,
b->backend_server->port,
STRSRVSTATUS(b->backend_server))));
break;
case LEAST_ROUTER_CONNECTIONS:
LOGIF(LT, (skygw_log_write_flush(LOGFILE_TRACE,
"%s:%d RWSplit connections : %d",
b->backend_server->name,
b->backend_server->port,
b->backend_conn_count)));
"RWSplit connections : %d in \t%s:%d %s",
b->backend_conn_count,
b->backend_server->name,
b->backend_server->port,
STRSRVSTATUS(b->backend_server))));
break;
case LEAST_CURRENT_OPERATIONS:
LOGIF(LT, (skygw_log_write_flush(LOGFILE_TRACE,
"%s:%d current operations : %d",
b->backend_server->name,
b->backend_server->port,
b->backend_server->stats.n_current_ops)));
"current operations : %d in \t%s:%d %s",
b->backend_server->stats.n_current_ops,
b->backend_server->name,
b->backend_server->port,
STRSRVSTATUS(b->backend_server))));
break;
case LEAST_BEHIND_MASTER:
LOGIF(LT, (skygw_log_write_flush(LOGFILE_TRACE,
"%s:%d replication lag : %d",
b->backend_server->name,
b->backend_server->port,
b->backend_server->rlag)));
"replication lag : %d in \t%s:%d %s",
b->backend_server->rlag,
b->backend_server->name,
b->backend_server->port,
STRSRVSTATUS(b->backend_server))));
default:
break;
}