diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
| commit | a22c8c5be5ceadd23eed707ae2f1308ced2de977 (patch) | |
| tree | 796cc97d1d103e18e0672d9b57dee4c54857073c /storage/archive/azio.c | |
| parent | 510835a0727fc1ebe98e2808cae91c8ab014d27e (diff) | |
| parent | 585cf08fe6a8d6e237732daa94a969f93e5c84ec (diff) | |
| download | mariadb-git-a22c8c5be5ceadd23eed707ae2f1308ced2de977.tar.gz | |
Merge MySQL 5.1.35 into MySQL 5.4
Diffstat (limited to 'storage/archive/azio.c')
| -rw-r--r-- | storage/archive/azio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/archive/azio.c b/storage/archive/azio.c index 59fbe2182ee..916dd8ba59d 100644 --- a/storage/archive/azio.c +++ b/storage/archive/azio.c @@ -390,7 +390,7 @@ int destroy (s) Reads the given number of uncompressed bytes from the compressed file. azread returns the number of bytes actually read (0 for end of file). */ -unsigned int ZEXPORT azread ( azio_stream *s, voidp buf, unsigned int len, int *error) +unsigned int ZEXPORT azread ( azio_stream *s, voidp buf, size_t len, int *error) { Bytef *start = (Bytef*)buf; /* starting point for crc computation */ Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */ |