MySQL patches by Codership

  1. Bug #432098
  2. Comment #1

Comment 1 for bug 432098

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

Used merge command:

 bzr merge -r tag:mysql-5.1.37..tag:mysql-5.1.38 lp:mysql-server

, which resulted in 3 conflicts:
Text conflict in .bzrignore
Text conflict in sql/mysqld.cc
Text conflict in support-files/mysql.spec.sh