[MDEV-27723] innodb.instant_alter,8k.rdiff does not apply on FreeBSD Created: 2022-02-02  Updated: 2022-04-12  Resolved: 2022-02-17

Status: Closed
Project: MariaDB Server
Component/s: Platform FreeBSD, Tests
Affects Version/s: 10.4.19, 10.5.10, 10.6.0, 10.4, 10.5
Fix Version/s: 10.4.25, 10.5.16, 10.6.8, 10.7.4, 10.8.3

Type: Bug Priority: Trivial
Reporter: Elena Stepanova Assignee: Marko Mäkelä
Resolution: Fixed Votes: 0
Labels: None
Environment:

FreeBSD 13, patch 2.0-12u11 FreeBSD


Issue Links:
Problem/Incident
is caused by MDEV-25057 Server crash in ut_list_insert or Ass... Closed
Relates
relates to MDEV-28304 innodb.instant_alter,8k.rdiff does no... Closed

 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.


Generated at Thu Feb 08 09:55:05 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.