Uploaded image for project: 'MariaDB Server'
  1. MariaDB Server
  2. MDEV-27723

innodb.instant_alter,8k.rdiff does not apply on FreeBSD

    XMLWordPrintable

    Details

      Description

      Other versions may be affected too, I didn't check

      worker[1] Using MTR_BUILD_THREAD 300, with reserved ports 16000..16019
      patch: **** misordered hunks! output would be garbled
      innodb.instant_alter '8k,innodb'         [ fail ]
              Test ended at 2022-02-02 17:04:59
       
      CURRENT_TEST: innodb.instant_alter
      

      Same effect if the rdiff is applied manually:

      [ec2-user@freebsd ~/mariadb-server/mysql-test]$ patch < instant_alter,8k.rdiff 
      Hmm...  Looks like a unified diff to me...
      The text leading up to this was:
      --------------------------
      |--- instant_alter.result
      |+++ instant_alter,8k.result
      --------------------------
      Patching file instant_alter.result using Plan A...
      Hunk #1 succeeded at 244 (offset 4 lines).
      Hunk #2 succeeded at 251 (offset 1 line).
      Hunk #3 succeeded at 266 (offset 5 lines).
      Hunk #4 succeeded at 273 (offset 2 lines).
      Hunk #5 succeeded at 402 (offset 28 lines).
      Hunk #6 succeeded at 400 (offset 3 lines).
      Hunk #7 succeeded at 439 with fuzz 1 (offset 29 lines).
      Hunk #8 succeeded at 1149 (offset 549 lines).
      Hunk #9 succeeded at 640 (offset 30 lines).
      patch: **** misordered hunks! output would be garbled
      

      On a Linux it applies all right.
      Specific to 8k variation.
      Maybe it will be enough just to re-record the rdiff.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              marko Marko Mäkelä
              Reporter:
              elenst Elena Stepanova
              Votes:
              0 Vote for this issue
              Watchers:
              1 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.