Merge with MySQL 5.1.42

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

Bug Description

Merge with lp:mysql-server tagged with tag:mysql-5.1.42 version

Changed in codership-mysql:
importance: Undecided → Low
assignee: nobody → Seppo Jaakola (seppo-jaakola)
milestone: none → 0.7.2
Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

Merging with command:

bzr merge -r tag:mysql-5.1.41..tag:mysql-5.1.42 lp:mysql-server/5.1

Text conflict in client/mysql.cc
Text conflict in storage/innobase/handler/ha_innodb.cc
Text conflict in storage/innodb_plugin/handler/ha_innodb.cc
3 conflicts encountered.

(note that 5.1 branch is currently: lp:mysql-server/5.1)

Changed in codership-mysql:
status: New → In Progress
Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

Merge result is now pushed in change set 2950

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.