diff options
author | Igor Babaev <igor@askmonty.org> | 2010-04-03 13:19:35 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2010-04-03 13:19:35 -0700 |
commit | 32a4805c5cf2b1bf8aee3e59abfe8aa3b9ad90b6 (patch) | |
tree | 31281669a3f273880b36158b9037ad05008f3661 /mysys | |
parent | 59baf97d56ab2a06fd6cde5509ba933c102fb203 (diff) | |
parent | 9560ff99c95f680b4c58595bc6b1aeb631128815 (diff) | |
download | mariadb-git-32a4805c5cf2b1bf8aee3e59abfe8aa3b9ad90b6.tar.gz |
Merge with the latest changes of 5.2
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/mf_keycache.c | 6 | ||||
-rw-r--r-- | mysys/my_gethostbyname.c | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 45a3dd699b1..4ee7b0e9ccf 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -4222,6 +4222,12 @@ restart: uint next_status; uint hash_requests; + LINT_INIT(next_hash_link); + LINT_INIT(next_diskpos); + LINT_INIT(next_file); + LINT_INIT(next_status); + LINT_INIT(hash_requests); + total_found++; found++; KEYCACHE_DBUG_ASSERT(found <= keycache->blocks_used); diff --git a/mysys/my_gethostbyname.c b/mysys/my_gethostbyname.c index 067fdfee9db..abd388302be 100644 --- a/mysys/my_gethostbyname.c +++ b/mysys/my_gethostbyname.c @@ -91,9 +91,12 @@ extern pthread_mutex_t LOCK_gethostbyname_r; is finished with the structure. */ -struct hostent *my_gethostbyname_r(const char *name, - struct hostent *result, char *buffer, - int buflen, int *h_errnop) +struct hostent * +my_gethostbyname_r(const char *name, + struct hostent *result __attribute__((unused)), + char *buffer __attribute__((unused)), + int buflen __attribute__((unused)), + int *h_errnop) { struct hostent *hp; pthread_mutex_lock(&LOCK_gethostbyname_r); |