Merge with MySQL 5.1.46
Bug #624638 reported by
Seppo Jaakola
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
MySQL patches by Codership |
Fix Released
|
Medium
|
Seppo Jaakola | ||
0.7 |
Fix Released
|
Medium
|
Seppo Jaakola | ||
Trunk |
Fix Released
|
Medium
|
Seppo Jaakola |
Bug Description
Merge with MySQL 5.1.46, use:
bzr merge -r tag:mysql-
description: | updated |
To post a comment you must log in.
bzr merge -r tag:mysql- 5.1.45. .tag:mysql- 5.1.46 lp:mysql-server/5.1 innodb_ plugin/ lock/lock0lock. c
Text conflict in sql/sql_delete.cc
Text conflict in storage/
2 conflicts encountered.