diff options
| author | unknown <dlenev@mysql.com> | 2005-03-21 11:39:47 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-03-21 11:39:47 +0300 |
| commit | 3d8ea9d1121b5e90d8b1f230b997754ecb661ae8 (patch) | |
| tree | 8ac553656af27c618e0ad07896c6795b92bebac5 /myisam | |
| parent | 2ba3544f0e053d95e82b9a899fd9b86cbb19b9ce (diff) | |
| parent | dc79caa979bba740f43582652821bd37c3ca10b6 (diff) | |
| download | mariadb-git-3d8ea9d1121b5e90d8b1f230b997754ecb661ae8.tar.gz | |
Manual merge of csets from -build tree into main 5.0 tree.
innobase/include/data0type.ic:
Auto merged
mysql-test/r/endspace.result:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
support-files/mysql.spec.sh:
Manual merge.
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_open.c | 4 | ||||
| -rw-r--r-- | myisam/mi_packrec.c | 2 |
2 files changed, 3 insertions, 3 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; diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c index cc62614cb07..4b512dd89dd 100644 --- a/myisam/mi_packrec.c +++ b/myisam/mi_packrec.c @@ -1212,7 +1212,7 @@ my_bool _mi_memmap_file(MI_INFO *info) DBUG_RETURN(0); } file_map=(byte*) - my_mmap(0,share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN,PROT_READ, + my_mmap(0,(size_t)(share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN),PROT_READ, MAP_SHARED | MAP_NORESERVE,info->dfile,0L); if (file_map == (byte*) MAP_FAILED) { |