Two conflicts resolved manually: Text conflict in sql/log.cc Text conflict in sql/mysqld.cc
Attach a file by drag & drop or click to upload
