Commit fe2425b7 authored by lenz@mysql.com's avatar lenz@mysql.com

- Avoid the error message "Can't read index header from..."

   when copying a small index file because the value returned
   for $length is < 1024. This can happen if the filehandle
   was open()ed as an UTF-8 encoded file with Unicode characters
   (In this case read() returns characters not bytes)
   (Thanks to Mike Bethune) for this hint)
parent d764fb42
...@@ -635,6 +635,7 @@ sub copy_index ...@@ -635,6 +635,7 @@ sub copy_index
my $to="$target/$file"; my $to="$target/$file";
my $buff; my $buff;
open(INPUT, "<$from") || die "Can't open file $from: $!\n"; open(INPUT, "<$from") || die "Can't open file $from: $!\n";
binmode(INPUT, ":raw");
my $length=read INPUT, $buff, 2048; my $length=read INPUT, $buff, 2048;
die "Can't read index header from $from\n" if ($length < 1024); die "Can't read index header from $from\n" if ($length < 1024);
close INPUT; close INPUT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment