Commit b51c819c authored by unknown's avatar unknown

The compiler warning fixed.

parent 5bfcd9b7
...@@ -298,7 +298,12 @@ struct st_pagecache_block_link ...@@ -298,7 +298,12 @@ struct st_pagecache_block_link
#endif #endif
KEYCACHE_CONDVAR *condvar; /* condition variable for 'no readers' event */ KEYCACHE_CONDVAR *condvar; /* condition variable for 'no readers' event */
uchar *buffer; /* buffer for the block page */ uchar *buffer; /* buffer for the block page */
void *write_locker; #ifdef THREAD
pthread_t write_locker;
#else
int write_locker;
#endif
ulonglong last_hit_time; /* timestamp of the last hit */ ulonglong last_hit_time; /* timestamp of the last hit */
WQUEUE WQUEUE
wqueue[COND_SIZE]; /* queues on waiting requests for new/old pages */ wqueue[COND_SIZE]; /* queues on waiting requests for new/old pages */
...@@ -2208,9 +2213,9 @@ static my_bool get_wrlock(PAGECACHE *pagecache, ...@@ -2208,9 +2213,9 @@ static my_bool get_wrlock(PAGECACHE *pagecache,
PAGECACHE_FILE file= block->hash_link->file; PAGECACHE_FILE file= block->hash_link->file;
pgcache_page_no_t pageno= block->hash_link->pageno; pgcache_page_no_t pageno= block->hash_link->pageno;
#ifdef THREAD #ifdef THREAD
void *locker= pthread_self(); pthread_t locker= pthread_self();
#else #else
void *locker= NULL; int locker= 0;
#endif #endif
DBUG_ENTER("get_wrlock"); DBUG_ENTER("get_wrlock");
DBUG_PRINT("info", ("the block 0x%lx " DBUG_PRINT("info", ("the block 0x%lx "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment