Some clean up

pull/1130/head
René Cannaò 9 years ago
parent f583982ace
commit 1c1faf210f

@ -564,7 +564,7 @@ bool MySQL_HostGroups_Manager::commit() {
MySrvC *mysrvc=(MySrvC *)ptr;
mysrvc->status=MYSQL_SERVER_STATUS_OFFLINE_HARD;
mysrvc->ConnectionsFree->drop_all_connections();
char *q1="DELETE FROM mysql_servers WHERE mem_pointer=%lld";
char *q1=(char *)"DELETE FROM mysql_servers WHERE mem_pointer=%lld";
char *q2=(char *)malloc(strlen(q1)+32);
sprintf(q2,q1,ptr);
mydb->execute(q2);

@ -3302,7 +3302,7 @@ char * ProxySQL_Admin::get_variable(char *name) {
if (!strcasecmp(name,"telnet_admin_ifaces")) return s_strdup(variables.telnet_admin_ifaces);
if (!strcasecmp(name,"telnet_stats_ifaces")) return s_strdup(variables.telnet_stats_ifaces);
if (!strcasecmp(name,"cluster_check_interval_ms")) {
sprintf(intbuf,"%lu",variables.cluster_check_interval_ms);
sprintf(intbuf,"%d",variables.cluster_check_interval_ms);
return strdup(intbuf);
}
if (!strcasecmp(name,"refresh_interval")) {
@ -3913,15 +3913,11 @@ void ProxySQL_Admin::stats___proxysql_servers_metrics() {
//if (resultset==NULL) return;
statsdb->execute("BEGIN");
statsdb->execute("DELETE FROM stats_proxysql_servers_metrics");
char *a=(char *)"INSERT INTO stats_proxysql_servers_metrics VALUES (\"%s\",\"%s\",)";
// make sure that the caller has called mysql_servers_wrlock()
char *query=NULL;
SQLite3_result *resultset=NULL;
resultset=GloProxyCluster->get_stats_proxysql_servers_metrics();
if (resultset) {
int rc;
sqlite3_stmt *statement1=NULL;
//sqlite3_stmt *statement32=NULL;
sqlite3 *mydb3=statsdb->get_db();
char *query1=NULL;
query1=(char *)"INSERT INTO stats_proxysql_servers_metrics VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10)";

@ -350,7 +350,7 @@ SQLite3_result * ProxySQL_Cluster_Nodes::stats_proxysql_servers_metrics() {
pta[0]=strdup(node->get_hostname());
sprintf(buf,"%d", node->get_port());
pta[1]=strdup(buf);
sprintf(buf,"%d", node->get_weight());
sprintf(buf,"%lu", node->get_weight());
pta[2]=strdup(buf);
pta[3]=strdup(node->get_comment());
ProxySQL_Node_Metrics *curr = node->get_metrics_curr();
@ -396,7 +396,7 @@ SQLite3_result * ProxySQL_Cluster_Nodes::dump_table_proxysql_servers() {
pta[0]=strdup(node->get_hostname());
sprintf(buf,"%d", node->get_port());
pta[1]=strdup(buf);
sprintf(buf,"%d", node->get_weight());
sprintf(buf,"%lu", node->get_weight());
pta[2]=strdup(buf);
pta[3]=strdup(node->get_comment());
result->add_row(pta);

Loading…
Cancel
Save