Comment 1 for bug 1228823

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

Text conflict in sql/mysqld.cc
Text conflict in sql/transaction.cc
Text conflict in storage/innobase/handler/ha_innodb.cc
3 conflicts encountered.