MySQL patches by Codership

Merge with MySQL 5.1.49

Bug #670153 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
0.7
Fix Released
Undecided
Unassigned
MySQL patches by Codership 0.7.6 "Gable"
0.8
Fix Released
Low
Seppo Jaakola
Trunk
Fix Released
Low
Seppo Jaakola

Bug Description

Merge with MySQL 5.1.49, use:

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

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.

Seppo Jaakola (seppo-jaakola)
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.
Subscribing...

Other bug subscribers

Remote bug watches

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