diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 14:46:35 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 14:46:35 +0400 |
| commit | 151e5d586cc59afb3c664d56d47265c964fe7fb1 (patch) | |
| tree | 1972ed60ad937e632cf111e7beafb2148a87efeb /mysys | |
| parent | 2083b7ddfd85b2bab837b73cb8357afcc2e893d8 (diff) | |
| parent | b495b3db2346a98650946ad5907ba3fe164eadc7 (diff) | |
| download | mariadb-git-151e5d586cc59afb3c664d56d47265c964fe7fb1.tar.gz | |
Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_compress.c | 5 | ||||
| -rw-r--r-- | mysys/my_getopt.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysys/my_compress.c b/mysys/my_compress.c index 26626d70079..ade2742c4fc 100644 --- a/mysys/my_compress.c +++ b/mysys/my_compress.c @@ -81,12 +81,13 @@ my_bool my_compress(uchar *packet, size_t *len, size_t *complen) This fix is safe, since such memory is only used internally by zlib, so we will not hide any bugs in mysql this way. */ -void *my_az_allocator(void *dummy, unsigned int items, unsigned int size) +void *my_az_allocator(void *dummy __attribute__((unused)), unsigned int items, + unsigned int size) { return my_malloc((size_t)items*(size_t)size, IF_VALGRIND(MY_ZEROFILL, MYF(0))); } -void my_az_free(void *dummy, void *address) +void my_az_free(void *dummy __attribute__((unused)), void *address) { my_free(address, MYF(MY_ALLOW_ZERO_PTR)); } diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index ceb99975cdb..46e07fda32e 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -611,6 +611,7 @@ static int setval(const struct my_option *opts, uchar* *value, char *argument, my_bool set_maximum_value) { int err= 0; + int pos; if (value && argument) { |