mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge with the latest changes of 5.2

Browse source
This commit is contained in:
Igor Babaev 2010-04-03 13:19:35 -07:00
commit 32a4805c5c
105 changed files with 2471 additions and 520 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mysys/mf_keycache.c
View file

@ -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);

9
mysys/my_gethostbyname.c
View file

@ -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);