#354914 by drewish: db errors after update_6000.