Details

    Description

      • CPU
      • 10.4
        • InnoDB-8.0 nothing applicable
        • oracle mode parser
        • WolfSSL (v5.7.0-stable)
        • Mroonga nothing new
        • PCRE nothing new
        • zlib zlib 1.3.1
          • also upgrade storage/connect/zip.* from zlib's contrib/minizip/
        • C/C v3.1 (wait Georg's OK) 51b2a62
          • ask Georg if everything is pushed for a release
        • merge with the main branch
      • 10.5
        • 10.4
        • PCRE2 (update url in cmake/pcre.cmake) PCRE2-10.43
        • ColumnStore 5.x nothing new
        • merge with the main branch
      • 10.6
        • 10.5
        • C/C v3.3 923a0092
          • ask Georg if everything is pushed for a release
        • ColumnStore 6.x 6.4.8-2
        • merge with the main branch
      • 10.11
        • 10.6
        • merge with the main branch
      • 11.0
        • 10.11
        • merge with the main branch
      • 11.1
        • 11.0
        • ColumnStore 23.x 23.10.1 a81afdaf5
        • merge with the main branch
      • 11.2
        • 11.1
        • merge with the main branch
      • 11.4
        • 11.2
        • must be 11.4.2-stable
        • C/C v3.4 cc985fab
          • ask Georg if everything is pushed for a release
        • merge with the main branch
      • 11.5
        • 11.4
        • must be 11.5.1-gamma
        • verify that all preview features are pushed
        • merge with the main branch

      Attachments

        Issue Links

          Activity

            In the 10.4 -> 10.5 merge there are conflicts in main/kill_processlist-6619.

            {test,result}

            , these should be resolved by choosing the version from 10.4. The reason for the conflict is that a fix ae063e4ff58 was cherry-picked into 10.4 from a later branch.

            (I wasn't able to merge the conflict myself as I got a failure in main.commit_1innodb that I'm not sure how to resolve).

            knielsen Kristian Nielsen added a comment - In the 10.4 -> 10.5 merge there are conflicts in main/kill_processlist-6619. {test,result} , these should be resolved by choosing the version from 10.4. The reason for the conflict is that a fix ae063e4ff58 was cherry-picked into 10.4 from a later branch. (I wasn't able to merge the conflict myself as I got a failure in main.commit_1innodb that I'm not sure how to resolve).

            Some handling of corrupted pages was broken on a merge of 10.11 to 11.0. I pushed a fix to the 11.1 branch.

            We have occasional recovery failures of the tests innodb.table_flags and innodb.log_data_file_size in the 11.2 branch, as well as other possible recovery failures. I have been unable to reproduce those myself. It is currently unclear to me if these failures are explained by the merge error that I fixed. I have failed to reproduce the failures on my local system. The best that I could today do was to find and file the rather unrelated issue MDEV-34200.

            marko Marko Mäkelä added a comment - Some handling of corrupted pages was broken on a merge of 10.11 to 11.0 . I pushed a fix to the 11.1 branch. We have occasional recovery failures of the tests innodb.table_flags and innodb.log_data_file_size in the 11.2 branch, as well as other possible recovery failures. I have been unable to reproduce those myself. It is currently unclear to me if these failures are explained by the merge error that I fixed. I have failed to reproduce the failures on my local system. The best that I could today do was to find and file the rather unrelated issue MDEV-34200 .

            MDEV-34209 and MDEV-34216 are directly related to the test failures.

            marko Marko Mäkelä added a comment - MDEV-34209 and MDEV-34216 are directly related to the test failures.

            People

              sanja Oleksandr Byelkin
              sanja Oleksandr Byelkin
              Votes:
              0 Vote for this issue
              Watchers:
              8 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.