diff options
| author | unknown <venu@myvenu.com> | 2003-02-20 14:14:37 -0800 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-02-20 14:14:37 -0800 |
| commit | 20e237e5eb2ff47622d7ad12c4085e5e8e4f843a (patch) | |
| tree | 5acab851085621a0ba8465cb1069b4dc1e3377cc /mysys/mf_keycache.c | |
| parent | 6963b121da9f583c962827dba046b97c2ad8c9a0 (diff) | |
| download | mariadb-git-20e237e5eb2ff47622d7ad12c4085e5e8e4f843a.tar.gz | |
Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM
strings/strto.c:
Windows won't compile for a wrong argument passing, expects a charset pointer
sql/filesort.cc:
Remove unused variable
sql/lex.h:
Change POINT->POINT_SYM due to redefination error from windef.h
sql/mysqld.cc:
Fix Embedded Server related code
sql/protocol.cc:
Remove unused variables from Embedded Server
sql/sql_class.h:
Remove silly usage
sql/sql_derived.cc:
Windows won't let you compile for this kind of assignments
sql/sql_help.cc:
Need a cast to make it compile
sql/sql_parse.cc:
Remove unused variables from Embedded server
sql/sql_yacc.yy:
Change POINT->POINT_SYM due to redefination error from windef.h
mysys/mf_keycache.c:
Add a correct cast and remove the unused variables
libmysqld/lib_sql.cc:
Remove unused variable
libmysqld/libmysqld.c:
Port the netware change to remove mysql_once_init to libmysqld
Diffstat (limited to 'mysys/mf_keycache.c')
| -rw-r--r-- | mysys/mf_keycache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 9d45ec8d539..482a594fa73 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -676,7 +676,7 @@ static inline void reg_requests(BLOCK_LINK *block, int count) static inline void unreg_request(BLOCK_LINK *block, int at_end) { if (! --block->requests) - link_block(block, at_end); + link_block(block, (my_bool)at_end); } /* @@ -1000,7 +1000,7 @@ restart: if (block->wqueue[COND_FOR_SAVED].last_thread) release_queue(&block->wqueue[COND_FOR_SAVED]); } - link_to_file_list(block, file, block->hash_link ? 1 : 0); + link_to_file_list(block, file, (my_bool)(block->hash_link ? 1 : 0)); block->status=error? BLOCK_ERROR : 0; block->length=0; block->offset=key_cache_block_size; @@ -1150,7 +1150,7 @@ byte *key_cache_read(File file, my_off_t filepos, byte *buff, uint length, { /* The requested page is to be read into the block buffer */ read_block(block,key_cache_block_size,read_length+offset, - page_st == PAGE_TO_BE_READ); + (my_bool)(page_st == PAGE_TO_BE_READ)); } else if (! (block->status & BLOCK_ERROR) && block->length < read_length + offset) @@ -1270,7 +1270,7 @@ int key_cache_write(File file, my_off_t filepos, byte *buff, uint length, read_block(block, offset + read_length >= key_cache_block_size? offset : key_cache_block_size, - offset,page_st == PAGE_TO_BE_READ); + offset,(my_bool)(page_st == PAGE_TO_BE_READ)); if (!dont_write) { /* buff has been written to disk at start */ |