|
|
|
|
@ -845,6 +845,10 @@ __end_monitor_connect_loop:
|
|
|
|
|
query=(char *)"DELETE FROM mysql_server_connect_log WHERE time_start < ?1";
|
|
|
|
|
rc=sqlite3_prepare_v2(mondb, query, -1, &statement, 0);
|
|
|
|
|
assert(rc==SQLITE_OK);
|
|
|
|
|
if (mysql_thread___monitor_history < mysql_thread___monitor_ping_interval * (mysql_thread___monitor_ping_max_failures + 1 )) { // issue #626
|
|
|
|
|
if (mysql_thread___monitor_ping_interval < 3600000)
|
|
|
|
|
mysql_thread___monitor_history = mysql_thread___monitor_ping_interval * (mysql_thread___monitor_ping_max_failures + 1 );
|
|
|
|
|
}
|
|
|
|
|
rc=sqlite3_bind_int64(statement, 1, start_time-mysql_thread___monitor_history*1000); assert(rc==SQLITE_OK);
|
|
|
|
|
SAFE_SQLITE3_STEP(statement);
|
|
|
|
|
rc=sqlite3_clear_bindings(statement); assert(rc==SQLITE_OK);
|
|
|
|
|
@ -985,6 +989,10 @@ __end_monitor_ping_loop:
|
|
|
|
|
query=(char *)"DELETE FROM mysql_server_ping_log WHERE time_start < ?1";
|
|
|
|
|
rc=sqlite3_prepare_v2(mondb, query, -1, &statement, 0);
|
|
|
|
|
assert(rc==SQLITE_OK);
|
|
|
|
|
if (mysql_thread___monitor_history < mysql_thread___monitor_ping_interval * (mysql_thread___monitor_ping_max_failures + 1 )) { // issue #626
|
|
|
|
|
if (mysql_thread___monitor_ping_interval < 3600000)
|
|
|
|
|
mysql_thread___monitor_history = mysql_thread___monitor_ping_interval * (mysql_thread___monitor_ping_max_failures + 1 );
|
|
|
|
|
}
|
|
|
|
|
rc=sqlite3_bind_int64(statement, 1, start_time-mysql_thread___monitor_history*1000); assert(rc==SQLITE_OK);
|
|
|
|
|
SAFE_SQLITE3_STEP(statement);
|
|
|
|
|
rc=sqlite3_clear_bindings(statement); assert(rc==SQLITE_OK);
|
|
|
|
|
@ -1235,6 +1243,10 @@ __end_monitor_read_only_loop:
|
|
|
|
|
query=(char *)"DELETE FROM mysql_server_read_only_log WHERE time_start < ?1";
|
|
|
|
|
rc=sqlite3_prepare_v2(mondb, query, -1, &statement, 0);
|
|
|
|
|
assert(rc==SQLITE_OK);
|
|
|
|
|
if (mysql_thread___monitor_history < mysql_thread___monitor_ping_interval * (mysql_thread___monitor_ping_max_failures + 1 )) { // issue #626
|
|
|
|
|
if (mysql_thread___monitor_ping_interval < 3600000)
|
|
|
|
|
mysql_thread___monitor_history = mysql_thread___monitor_ping_interval * (mysql_thread___monitor_ping_max_failures + 1 );
|
|
|
|
|
}
|
|
|
|
|
rc=sqlite3_bind_int64(statement, 1, start_time-mysql_thread___monitor_history*1000); assert(rc==SQLITE_OK);
|
|
|
|
|
SAFE_SQLITE3_STEP(statement);
|
|
|
|
|
rc=sqlite3_clear_bindings(statement); assert(rc==SQLITE_OK);
|
|
|
|
|
@ -1421,6 +1433,10 @@ __end_monitor_replication_lag_loop:
|
|
|
|
|
query=(char *)"DELETE FROM mysql_server_replication_lag_log WHERE time_start < ?1";
|
|
|
|
|
rc=sqlite3_prepare_v2(mondb, query, -1, &statement, 0);
|
|
|
|
|
assert(rc==SQLITE_OK);
|
|
|
|
|
if (mysql_thread___monitor_history < mysql_thread___monitor_ping_interval * (mysql_thread___monitor_ping_max_failures + 1 )) { // issue #626
|
|
|
|
|
if (mysql_thread___monitor_ping_interval < 3600000)
|
|
|
|
|
mysql_thread___monitor_history = mysql_thread___monitor_ping_interval * (mysql_thread___monitor_ping_max_failures + 1 );
|
|
|
|
|
}
|
|
|
|
|
rc=sqlite3_bind_int64(statement, 1, start_time-mysql_thread___monitor_history*1000); assert(rc==SQLITE_OK);
|
|
|
|
|
SAFE_SQLITE3_STEP(statement);
|
|
|
|
|
rc=sqlite3_clear_bindings(statement); assert(rc==SQLITE_OK);
|
|
|
|
|
|