diff options
| author | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-09-23 16:47:08 +0300 |
|---|---|---|
| committer | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-09-23 16:47:08 +0300 |
| commit | acf218b708c68f5fff9fea9450a438116866f1d5 (patch) | |
| tree | dabaf9b38c2c72433e000b36b0a628d9d36fbb38 /myisam/mi_open.c | |
| parent | f5c00b0dbda74c899067880ac0de5c489d54b19f (diff) | |
| download | mariadb-git-acf218b708c68f5fff9fea9450a438116866f1d5.tar.gz | |
Several fixes revelaled by Intel compiler.
Diffstat (limited to 'myisam/mi_open.c')
| -rw-r--r-- | myisam/mi_open.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index 82663e0c318..ffc418894e3 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -199,7 +199,8 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) DBUG_PRINT("warning",("saved_base_info_length: %d base_info_length: %d", len,MI_BASE_INFO_SIZE)) } - disk_pos=my_n_base_info_read((uchar*) disk_cache + base_pos, &share->base); + disk_pos= (char*) + my_n_base_info_read((uchar*) disk_cache + base_pos, &share->base); share->state.state_length=base_pos; if (!(open_flags & HA_OPEN_FOR_REPAIR) && @@ -863,7 +864,7 @@ uint mi_state_info_write(File file, MI_STATE_INFO *state, uint pWrite) } -char *mi_state_info_read(uchar *ptr, MI_STATE_INFO *state) +uchar *mi_state_info_read(uchar *ptr, MI_STATE_INFO *state) { uint i,keys,key_parts,key_blocks; memcpy_fixed(&state->header,ptr, sizeof(state->header)); @@ -974,7 +975,7 @@ uint mi_base_info_write(File file, MI_BASE_INFO *base) } -char *my_n_base_info_read(uchar *ptr, MI_BASE_INFO *base) +uchar *my_n_base_info_read(uchar *ptr, MI_BASE_INFO *base) { base->keystart = mi_sizekorr(ptr); ptr +=8; base->max_data_file_length = mi_sizekorr(ptr); ptr +=8; |