diff options
| author | monty@hundin.mysql.fi <> | 2002-08-21 22:04:22 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-21 22:04:22 +0300 |
| commit | 03b0179af9f3492c4682dbc85542529215010a7c (patch) | |
| tree | 75f29bea26c7fd21a45f22fd906c7a1545aaee91 /mysys/mf_iocache.c | |
| parent | a5edb200421018ee967045903b2802c2d5c1bd75 (diff) | |
| download | mariadb-git-03b0179af9f3492c4682dbc85542529215010a7c.tar.gz | |
Use our version of RWLOCKS on UNIXWARE 7
More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL
Diffstat (limited to 'mysys/mf_iocache.c')
| -rw-r--r-- | mysys/mf_iocache.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 6f7fb907ad5..43b3d30915f 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -392,8 +392,8 @@ int _my_b_read(register IO_CACHE *info, byte *Buffer, uint Count) if ((read_length=my_read(info->file,Buffer,(uint) length,info->myflags)) != (uint) length) { - info->error= read_length == (uint) -1 ? -1 : - (int) (read_length+left_length); + info->error= (read_length == (uint) -1 ? -1 : + (int) (read_length+left_length)); DBUG_RETURN(1); } Count-=length; @@ -422,6 +422,7 @@ int _my_b_read(register IO_CACHE *info, byte *Buffer, uint Count) { if (length != (uint) -1) memcpy(Buffer,info->buffer,(size_t) length); + info->pos_in_file= pos_in_file; info->error= length == (uint) -1 ? -1 : (int) (length+left_length); info->read_pos=info->read_end=info->buffer; DBUG_RETURN(1); |