fix merge conflict libmysql/libmysql.c: fix merge conflict
Attach a file by drag & drop or click to upload
