Merge branch 'master' of ssh://git.sip-router.org/sip-router

* 'master' of ssh://git.sip-router.org/sip-router:
  db_mysql: proper handling of mysql_next_result(...) return code
  ims_charging: bugfix: Make ims_charging:ccr_timeouts resettable

modules/ims_charging/mod.c

@@ -122,7 +122,7 @@ stat_export_t charging_stats[] = {
     {"ccr_responses_time", STAT_NO_RESET, &ccr_responses_time},
     {"billed_secs", STAT_NO_RESET, &billed_secs},
     {"killed_calls", STAT_NO_RESET, &killed_calls},
-    {"ccr_timeouts", STAT_NO_RESET, &ccr_timeouts},
+    {"ccr_timeouts", 0, &ccr_timeouts},
     {0, 0, 0}
 };