Details
-
Type:
Task
-
Status: Closed
-
Priority:
Trivial
-
Resolution: Fixed
-
Fix Version/s: 5.5.32-galera
-
Component/s: None
-
Labels:None
Description
merge with mariaDB 5.5.31 and all prior revisions before MySQL 5.5.31 milestone in lp:codership-mysql/5.5-23
Gliffy Diagrams
Attachments
Activity
- All
- Comments
- Work Log
- History
- Activity
- Transitions
MariaDB 5.5.30 merge completed in revision: http://bazaar.launchpad.net/~maria-captains/maria/maria-5.5-galera/revision/3393
bzr merge lp:maria/5.5 -rtag:mariadb-5.5.30
bzr merge lp:maria/5.5 -rtag:mariadb-5.5.31
Text conflict in cmake/cpack_rpm.cmake
Text conflict in debian/dist/Debian/control
Text conflict in debian/dist/Ubuntu/control
Text conflict in sql/CMakeLists.txt
Conflict adding file sql/db.opt. Moved existing file to sql/db.opt.moved.
Conflict adding file sql/db.opt.moved. Moved existing file to sql/db.opt.moved.moved.
Text conflict in sql/mysqld.cc
Text conflict in support-files/mysql.spec.sh
8 conflicts encountered.
resolving of debian and RPM config conflicts was rather uneducated - needs review
Final merge result pushed in revision: http://bazaar.launchpad.net/~maria-captains/maria/maria-5.5-galera/revision/3395
Reopened to be able to move to correct fix version
Hi Seppo,
We just released 5.5.31, so I suggest to make it "Merge with MariaDB 5.5.31" instead.