Merge with MySQL 5.1.42
Bug #505081 reported by
Seppo Jaakola
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 |
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.
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 innobase/ handler/ ha_innodb. cc innodb_ plugin/ handler/ ha_innodb. cc
Text conflict in storage/
Text conflict in storage/
3 conflicts encountered.
(note that 5.1 branch is currently: lp:mysql-server/5.1)