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
conflicts in sql/log_event.cc and storage/ innodb/ lock/lock0lock. cc
Merge result pushed in revision: bazaar. launchpad. net/~codership/ codership- mysql/5. 6/revision/ 4148
http://