Merge with MySQL 5.5.31

Bug #1184103 reported by Seppo Jaakola
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
MySQL patches by Codership
Fix Released
Wishlist
Seppo Jaakola

Bug Description

bzr merge -r tag:mysql-5.5.30..tag:mysql-5.5.31 lp:mysql-server/5.5

Changed in codership-mysql:
status: New → In Progress
importance: Undecided → Wishlist
assignee: nobody → Seppo Jaakola (seppo-jaakola)
milestone: none → 5.5.30-23.7.4
Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

bzr merge lp:mysql-server/5.5 -rtag:mysql-5.5.30..tag:mysql-5.5.31
...
Contents conflict in mysql-test/suite/innodb/r/innodb_bug14147491.result
Contents conflict in mysql-test/suite/innodb/t/innodb_bug14147491.test
Text conflict in sql/mysqld.cc
Text conflict in support-files/mysql.spec.sh
4 conflicts encountered.

Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :
Changed in codership-mysql:
status: In Progress → Fix Committed
Changed in codership-mysql:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.