#42000, Watchdog can't log errors when using db_set_active(non-default), patch by Chris Johnson and myself