[MDEV-4572] Merge with MariaDB 5.5.31 Created: 2013-05-24  Updated: 2013-08-28  Resolved: 2013-08-28

Status: Closed
Project: MariaDB Server
Component/s: None
Fix Version/s: 5.5.32-galera

Type: Task Priority: Trivial
Reporter: Seppo Jaakola Assignee: Seppo Jaakola
Resolution: Fixed Votes: 0
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



 Comments   
Comment by Elena Stepanova [ 2013-05-24 ]

Hi Seppo,

We just released 5.5.31, so I suggest to make it "Merge with MariaDB 5.5.31" instead.

Comment by Seppo Jaakola [ 2013-05-26 ]

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

Comment by Seppo Jaakola [ 2013-05-26 ]

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

Comment by Seppo Jaakola [ 2013-05-26 ]

Final merge result pushed in revision: http://bazaar.launchpad.net/~maria-captains/maria/maria-5.5-galera/revision/3395

Comment by Rasmus Johansson (Inactive) [ 2013-08-28 ]

Reopened to be able to move to correct fix version

Generated at Thu Feb 08 06:57:27 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.