mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge gleb.loc:/home/uchum/work/bk/PA/5.1-opt-31036-v

Browse source 
into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/archive.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
storage/archive/azio.c:
  Auto merged
This commit is contained in:
unknown 2007-10-28 01:27:47 +05:00
commit 639e35d031
4 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
storage/archive/azio.c
View file

@ -681,8 +681,8 @@ my_off_t azseek (s, offset, whence)
/* There was a zmemzero here if inbuf was null -Brian */
while (offset > 0)
{
uInt size = AZ_BUFSIZE_WRITE;
if (offset < AZ_BUFSIZE_WRITE) size = (uInt)offset;
uInt size = AZ_BUFSIZE_READ;
if (offset < AZ_BUFSIZE_READ) size = (uInt)offset;
size = azwrite(s, s->inbuf, size);
if (size == 0) return -1L;
@ -725,11 +725,11 @@ my_off_t azseek (s, offset, whence)
}
while (offset > 0) {
int error;
unsigned int size = AZ_BUFSIZE_READ;
if (offset < AZ_BUFSIZE_READ) size = (int)offset;
unsigned int size = AZ_BUFSIZE_WRITE;
if (offset < AZ_BUFSIZE_WRITE) size = (int)offset;
size = azread(s, s->outbuf, size, &error);
if (error <= 0) return -1L;
if (error < 0) return -1L;
offset -= size;
}
return s->out;