Merge "Make database code work with mysql8"