Merge branch '2.2' into develop

2018-06-06 08:56:31 +03:00
parent 17c9ac95bd f2b2951c99
commit 70fdd0fc17
26 changed files with 140 additions and 57 deletions
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@ -304,6 +304,7 @@ void MariaDBMonitor::main()

    while (!should_shutdown())
    {
+        atomic_add_uint64(&m_monitor->ticks, 1);
        timespec loop_start;
        /* Coarse time has resolution ~1ms (as opposed to 1ns) but this is enough. */
        clock_gettime(CLOCK_MONOTONIC_COARSE, &loop_start);