diff options
| author | venu@myvenu.com <> | 2003-01-18 14:04:34 -0800 |
|---|---|---|
| committer | venu@myvenu.com <> | 2003-01-18 14:04:34 -0800 |
| commit | e0a79dc112bf376a7ea64231f6c11688bd8b99de (patch) | |
| tree | 0224ea691e3d85f3eebb0412ae0b6eea5a4e39c8 /myisam | |
| parent | 9305ee0d54b7cb7b571f2205b351a6edd63da7d3 (diff) | |
| download | mariadb-git-e0a79dc112bf376a7ea64231f6c11688bd8b99de.tar.gz | |
Windows build fix
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 16 | ||||
| -rw-r--r-- | myisam/rt_mbr.c | 8 |
2 files changed, 4 insertions, 20 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 28c28e628ea..700ac5b0b62 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -62,22 +62,6 @@ static SORT_KEY_BLOCKS *alloc_key_blocks(MI_CHECK *param, uint blocks, static ha_checksum mi_byte_checksum(const byte *buf, uint length); static void set_data_file_type(SORT_INFO *sort_info, MYISAM_SHARE *share); -#ifdef __WIN__ -static double ulonglong2double(ulonglong value) -{ - longlong nr=(longlong) value; - if (nr >= 0) - return (double) nr; - return (18446744073709551616.0 + (double) nr); -} - -#if SIZEOF_OFF_T > 4 -#define my_off_t2double(A) ulonglong2double(A) -#else -#define my_off_t2double(A) ((double) (A)) -#endif /* SIZEOF_OFF_T > 4 */ -#endif /* __WIN__ */ - void myisamchk_init(MI_CHECK *param) { bzero((gptr) param,sizeof(*param)); diff --git a/myisam/rt_mbr.c b/myisam/rt_mbr.c index e9cf7a6176e..bb13c0769b3 100644 --- a/myisam/rt_mbr.c +++ b/myisam/rt_mbr.c @@ -228,7 +228,7 @@ double rtree_rect_volume(HA_KEYSEG *keyseg, uchar *a, uint key_length) case HA_KEYTYPE_LONGLONG: RT_VOL_KORR(longlong, mi_sint8korr, 8, (double)); case HA_KEYTYPE_ULONGLONG: - RT_VOL_KORR(ulonglong, mi_uint8korr, 8, ulonglong2double); + RT_VOL_KORR(longlong, mi_sint8korr, 8, ulonglong2double); #endif case HA_KEYTYPE_FLOAT: RT_VOL_GET(float, mi_float4get, 4, (double)); @@ -311,7 +311,7 @@ int rtree_d_mbr(HA_KEYSEG *keyseg, uchar *a, uint key_length, double *res) case HA_KEYTYPE_LONGLONG: RT_D_MBR_KORR(longlong, mi_sint8korr, 8, (double)); case HA_KEYTYPE_ULONGLONG: - RT_D_MBR_KORR(ulonglong, mi_uint8korr, 8, ulonglong2double); + RT_D_MBR_KORR(longlong, mi_sint8korr, 8, ulonglong2double); #endif case HA_KEYTYPE_FLOAT: RT_D_MBR_GET(float, mi_float4get, 4, (double)); @@ -516,7 +516,7 @@ double rtree_overlapping_area(HA_KEYSEG *keyseg, uchar* a, uchar* b, case HA_KEYTYPE_LONGLONG: RT_OVL_AREA_KORR(longlong, mi_sint8korr, 8); case HA_KEYTYPE_ULONGLONG: - RT_OVL_AREA_KORR(ulonglong, mi_uint8korr, 8); + RT_OVL_AREA_KORR(longlong, mi_sint8korr, 8); #endif case HA_KEYTYPE_FLOAT: RT_OVL_AREA_GET(float, mi_float4get, 4); @@ -614,7 +614,7 @@ double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b, case HA_KEYTYPE_LONGLONG: RT_AREA_INC_KORR(longlong, mi_sint8korr, 8); case HA_KEYTYPE_ULONGLONG: - RT_AREA_INC_KORR(ulonglong, mi_uint8korr, 8); + RT_AREA_INC_KORR(longlong, mi_sint8korr, 8); #endif case HA_KEYTYPE_FLOAT: RT_AREA_INC_GET(float, mi_float4get, 4); |