Merge with 5.1.38
Bug #432098 reported by
Seppo Jaakola
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
MySQL patches by Codership |
Fix Released
|
Medium
|
Seppo Jaakola |
Bug Description
Merge with lp:mysql-server release 5.1.38
Changed in codership-mysql: | |
importance: | Undecided → Medium |
assignee: | nobody → Seppo Jaakola (seppo-jaakola) |
milestone: | none → 0.7 |
status: | New → In Progress |
Changed in codership-mysql: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
Used merge command:
bzr merge -r tag:mysql- 5.1.37. .tag:mysql- 5.1.38 lp:mysql-server
, which resulted in 3 conflicts: files/mysql. spec.sh
Text conflict in .bzrignore
Text conflict in sql/mysqld.cc
Text conflict in support-