integrate struct changes from the master branch of go-sql-driver/mysql