Skip to content

Commit c2a7593

Browse files
author
Aditya A
committed
Bug #32475201 PB2 FAILURE IN 5.7 INNODB_ZIP.INNOCHECKSUM_2
Pattern matching error in test case. Fixed by correcting it Reviewed by : Sven Sandberg <sven.sandberg@oracle.com>
1 parent 68c0d66 commit c2a7593

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

mysql-test/suite/innodb_zip/r/innochecksum_2.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ INSERT INTO t1 SELECT * from t1;
1919
[2]:# Run the innochecksum when file isn't provided.
2020
# It will print the innochecksum usage similar to --help option.
2121
innochecksum Ver #.#.#
22-
Copyright (c) YEAR, YEAR, Oracle and/or its affiliates.
22+
Copyright (c) YEAR, YEAR , Oracle and/or its affiliates.
2323

2424
Oracle is a registered trademark of Oracle Corporation and/or its
2525
affiliates. Other names may be trademarks of their respective

mysql-test/suite/innodb_zip/t/innochecksum_2.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ open OUT_FILE, ">", "$dir/tmp/tmpfile" or die $!;
5959
while(<IN_FILE>) {
6060
unless ($_=~ /^debug.*$/ || $_=~ /\-#, \-\-debug.*$/ || $_=~ /http:.*html/) {
6161
$_=~ s/^\S*innochecksum.+Ver.+[0-9]*\.[0-9]*\.[0-9]*.+$/innochecksum Ver #.#.#/g;
62-
$_=~ s/(Copyright\s\(c\))\s([0-9]*),\s([0-9]*)\s(.*)/$1 YEAR, YEAR $4/g;
62+
$_=~ s/(Copyright\s\(c\))\s([0-9]*),\s([0-9]*)(.*)/$1 YEAR, YEAR $4/g;
6363
$_=~ s/Usage:.*\[-c/Usage: innochecksum [-c/g;
6464
print OUT_FILE $_;
6565
}

0 commit comments

Comments
 (0)