Details

    • Task
    • Status: Closed (View Workflow)
    • Trivial
    • Resolution: Fixed
    • 5.5.32-galera
    • None
    • 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

      Attachments

        Activity

          Hi Seppo,

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

          elenst Elena Stepanova added a comment - Hi Seppo, We just released 5.5.31, so I suggest to make it "Merge with MariaDB 5.5.31" instead.
          seppo Seppo Jaakola added a comment - - edited

          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

          seppo Seppo Jaakola added a comment - - edited 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
          seppo Seppo Jaakola added a comment -

          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

          seppo Seppo Jaakola added a comment - 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
          seppo Seppo Jaakola added a comment - 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

          ratzpo Rasmus Johansson (Inactive) added a comment - Reopened to be able to move to correct fix version

          People

            seppo Seppo Jaakola
            seppo Seppo Jaakola
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Git Integration

                Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.