Merge with MySQL 5.5.31
Bug #1184103 reported by
Seppo Jaakola
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
MySQL patches by Codership |
Fix Released
|
Wishlist
|
Seppo Jaakola |
Bug Description
bzr merge -r tag:mysql-
Changed in codership-mysql: | |
status: | New → In Progress |
importance: | Undecided → Wishlist |
assignee: | nobody → Seppo Jaakola (seppo-jaakola) |
milestone: | none → 5.5.30-23.7.4 |
Changed in codership-mysql: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
bzr merge lp:mysql-server/5.5 -rtag:mysql- 5.5.30. .tag:mysql- 5.5.31 suite/innodb/ r/innodb_ bug14147491. result suite/innodb/ t/innodb_ bug14147491. test files/mysql. spec.sh
...
Contents conflict in mysql-test/
Contents conflict in mysql-test/
Text conflict in sql/mysqld.cc
Text conflict in support-
4 conflicts encountered.