Merge from go-sql-driver/mysql