diff options
| author | jimw@mysql.com <> | 2005-03-18 16:12:25 -0800 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-03-18 16:12:25 -0800 |
| commit | ee2b4ec959b5813eb2105ea068ae3f725b106a3b (patch) | |
| tree | 61d6303821b0ae97f521facf399af6c9ba99e342 /myisam/mi_open.c | |
| parent | 348c285d0f06b46809758f26ca92d6ee6155bac9 (diff) | |
| download | mariadb-git-ee2b4ec959b5813eb2105ea068ae3f725b106a3b.tar.gz | |
Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826)
Diffstat (limited to 'myisam/mi_open.c')
| -rw-r--r-- | myisam/mi_open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index 504bc33ecc1..d65a46a92fb 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -1090,10 +1090,10 @@ char *mi_keyseg_read(char *ptr, HA_KEYSEG *keyseg) keyseg->null_pos = mi_uint4korr(ptr); ptr +=4; keyseg->charset=0; /* Will be filled in later */ if (keyseg->null_bit) - keyseg->bit_pos= keyseg->null_pos + (keyseg->null_bit == 7); + keyseg->bit_pos= (uint16)(keyseg->null_pos + (keyseg->null_bit == 7)); else { - keyseg->bit_pos= keyseg->null_pos; + keyseg->bit_pos= (uint16)keyseg->null_pos; keyseg->null_pos= 0; } return ptr; |