Comment 1 for bug 593177

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

bzr merge -r tag:mysql-5.1.44..tag:mysql-5.1.45 lp:mysql-server/5.1

Text conflict in storage/innobase/lock/lock0lock.c
Text conflict in support-files/mysql.spec.sh
2 conflicts encountered.