diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-05-31 17:45:22 +0300 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-05-31 17:45:22 +0300 |
| commit | 2c8f4f97910bec416fc9a375cf1c74be2ca395cc (patch) | |
| tree | c5cb3acad2572a7c0914ef20f2d942ea40433ab7 /mysys/my_compress.c | |
| parent | b035219762efeea657e687cf7b43279d7962a2eb (diff) | |
| download | mariadb-git-2c8f4f97910bec416fc9a375cf1c74be2ca395cc.tar.gz | |
Added casts to avoid compiler warnings and fixed a wrong type.
---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.
Diffstat (limited to 'mysys/my_compress.c')
| -rw-r--r-- | mysys/my_compress.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_compress.c b/mysys/my_compress.c index 3966be8b6bb..d495a1c1c6d 100644 --- a/mysys/my_compress.c +++ b/mysys/my_compress.c @@ -68,7 +68,7 @@ uchar *my_compress_alloc(const uchar *packet, size_t *len, size_t *complen) return 0; /* Not enough memory */ tmp_complen= *complen; - res= compress((Bytef*) compbuf, &tmp_complen, (Bytef*) packet, *len); + res= compress((Bytef*) compbuf, &tmp_complen, (Bytef*) packet, (uLong) *len); *complen= tmp_complen; if (res != Z_OK) @@ -120,7 +120,7 @@ my_bool my_uncompress(uchar *packet, size_t len, size_t *complen) tmp_complen= *complen; error= uncompress((Bytef*) compbuf, &tmp_complen, (Bytef*) packet, - len); + (uLong) len); *complen= tmp_complen; if (error != Z_OK) { /* Probably wrong packet */ |