MySQL patches by Codership

  1. Bug #670153
  2. Comment #1

Comment 1 for bug 670153

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

bzr merge -r tag:mysql-5.1.48..tag:mysql-5.1.49 lp:mysql-server/5.1

Text conflict in sql/sql_parse.cc
Text conflict in storage/innobase/lock/lock0lock.c
Text conflict in storage/innodb_plugin/lock/lock0lock.c
Text conflict in storage/innodb_plugin/row/row0ins.c
4 conflicts encountered.