mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
4a1763e428
- one which led REDO_INSERT_ROW_BLOBS to fail to apply
- one excess close ("-1 file left open")
Don't need maria-path option / environment variable.
Fixes for ma_test_all-t to run under Windows.
Port of ma_test_recovery to Perl, written by Jani.
storage/maria/unittest/ma_test_recovery.expected:
Rename: storage/maria/ma_test_recovery.expected -> storage/maria/unittest/ma_test_recovery.expected
mysys/my_pread.c:
Fix for Windows-specific bug (maria_read_log -a failed during
ma_test_all-t): Windows does not have pread() so the branch setting
HA_ERR_FILE_TOO_SHORT was not compiled in, broke applying of
REDO_INSERT_ROW_BLOBS. After fixing that, it appeared that in my
Windows machine, errno is not changed in case of EOF; as we read it
we have to reset it at start.
The changed to readbytes!=-1 is to detect EOF
mysys/my_read.c:
The change to readbytes!=-1 is to detect EOF
storage/maria/ma_loghandler.c:
Fix for Windows-specific bug: as we don't open the directory
we should not close it.
storage/maria/ma_page.c:
This is C, cannot declare variable after instruction.
storage/maria/ma_test_recovery:
ma_test_recovery.expected moved
storage/maria/unittest/ma_test_all-t:
Can now safely guess maria_path so don't need the command-line option
or environment variable. Port to Windows (.exe, different locations
of executables); can guess suffix, don't need --suffix.
storage/maria/unittest/ma_test_recovery.pl:
Perl version of ma_test_recovery, written by Jani. Will deprecate the
shell version.
91 lines
3 KiB
C
91 lines
3 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
#include <my_base.h>
|
|
#include <errno.h>
|
|
|
|
/*
|
|
Read a chunk of bytes from a file with retry's if needed
|
|
|
|
The parameters are:
|
|
File descriptor
|
|
Buffer to hold at least Count bytes
|
|
Bytes to read
|
|
Flags on what to do on error
|
|
|
|
Return:
|
|
-1 on error
|
|
0 if flag has bits MY_NABP or MY_FNABP set
|
|
N number of bytes read.
|
|
*/
|
|
|
|
size_t my_read(File Filedes, uchar *Buffer, size_t Count, myf MyFlags)
|
|
{
|
|
size_t readbytes, save_count;
|
|
DBUG_ENTER("my_read");
|
|
DBUG_PRINT("my",("fd: %d Buffer: 0x%lx Count: %lu MyFlags: %d",
|
|
Filedes, (long) Buffer, (ulong) Count, MyFlags));
|
|
save_count= Count;
|
|
|
|
for (;;)
|
|
{
|
|
errno= 0; /* Linux, Windows don't reset this on EOF/success */
|
|
if ((readbytes= read(Filedes, Buffer, Count)) != Count)
|
|
{
|
|
my_errno= errno;
|
|
if (errno == 0 || (readbytes != (size_t) -1 &&
|
|
(MyFlags & (MY_NABP | MY_FNABP))))
|
|
my_errno= HA_ERR_FILE_TOO_SHORT;
|
|
DBUG_PRINT("warning",("Read only %d bytes off %lu from %d, errno: %d",
|
|
(int) readbytes, (ulong) Count, Filedes,
|
|
my_errno));
|
|
#ifdef THREAD
|
|
if ((readbytes == 0 || (int) readbytes == -1) && errno == EINTR)
|
|
{
|
|
DBUG_PRINT("debug", ("my_read() was interrupted and returned %ld",
|
|
(long) readbytes));
|
|
continue; /* Interrupted */
|
|
}
|
|
#endif
|
|
if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
|
|
{
|
|
if (readbytes == (size_t) -1)
|
|
my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(Filedes),my_errno);
|
|
else if (MyFlags & (MY_NABP | MY_FNABP))
|
|
my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(Filedes),my_errno);
|
|
}
|
|
if (readbytes == (size_t) -1 ||
|
|
((MyFlags & (MY_FNABP | MY_NABP)) && !(MyFlags & MY_FULL_IO)))
|
|
DBUG_RETURN(MY_FILE_ERROR); /* Return with error */
|
|
if (readbytes != (size_t) -1 && (MyFlags & MY_FULL_IO))
|
|
{
|
|
Buffer+= readbytes;
|
|
Count-= readbytes;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
if (MyFlags & (MY_NABP | MY_FNABP))
|
|
readbytes= 0; /* Ok on read */
|
|
else if (MyFlags & MY_FULL_IO)
|
|
readbytes= save_count;
|
|
break;
|
|
}
|
|
DBUG_RETURN(readbytes);
|
|
} /* my_read */
|