Comment 1 for bug 1378686

Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

conflicts in sql/log_event.cc and storage/innodb/lock/lock0lock.cc

Merge result pushed in revision:
http://bazaar.launchpad.net/~codership/codership-mysql/5.6/revision/4148