diff options
| author | Michael Widenius <monty@mysql.com> | 2009-04-25 13:05:32 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-04-25 13:05:32 +0300 |
| commit | e726e587ec6287472dd450dbcbddf07669b3e028 (patch) | |
| tree | e644a6134bfe892512501c648c938a2e93f08130 /storage/archive/azio.c | |
| parent | 210a412522b10115d34b431c66acf403faab7bfe (diff) | |
| parent | 086185089e6c7bef58dde49b02950689af9fee63 (diff) | |
| download | mariadb-git-e726e587ec6287472dd450dbcbddf07669b3e028.tar.gz | |
Merged with mysql-5.1 tree.
client/mysqltest.cc:
Manually merged
configure.in:
Manually merged
mysql-test/r/variables.result:
Manually merged
mysql-test/t/variables.test:
Manually merged
mysys/my_pread.c:
Manually merged
mysys/my_read.c:
Manually merged
sql/mysqld.cc:
Manually merged
storage/csv/ha_tina.h:
Manually merged
storage/myisam/ha_myisam.cc:
Manually merged
storage/myisam/mi_check.c:
Manually merged
storage/myisam/mi_search.c:
Manually merged
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 6d088f279ac..bf2fda66dce 100644 --- a/storage/archive/azio.c +++ b/storage/archive/azio.c @@ -424,7 +424,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) */ |