Merge with MySQL 5.1.49
Bug #670153 reported by
Seppo Jaakola
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 | ||
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-
Changed in codership-mysql: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
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 innobase/ lock/lock0lock. c innodb_ plugin/ lock/lock0lock. c innodb_ plugin/ row/row0ins. c
Text conflict in storage/
Text conflict in storage/
Text conflict in storage/
4 conflicts encountered.