summaryrefslogtreecommitdiff
path: root/myisam/mi_unique.c
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-06-11 21:20:53 +0200
committerunknown <serg@serg.mylan>2004-06-11 21:20:53 +0200
commitd5880298be964042658b38a54c2ac149327c95b0 (patch)
tree6c64f2363a9bbe8a71b9853a4f17c6a46d72e511 /myisam/mi_unique.c
parente9242d685b25e0dce109719e79271edf1b1581e5 (diff)
downloadmariadb-git-d5880298be964042658b38a54c2ac149327c95b0.tar.gz
after merge fix
myisam/mi_unique.c: warning removed
Diffstat (limited to 'myisam/mi_unique.c')
-rw-r--r--myisam/mi_unique.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/myisam/mi_unique.c b/myisam/mi_unique.c
index 4d82858c9ad..06d50e6905b 100644
--- a/myisam/mi_unique.c
+++ b/myisam/mi_unique.c
@@ -69,9 +69,9 @@ my_bool mi_check_unique(MI_INFO *info, MI_UNIQUEDEF *def, byte *record,
ha_checksum mi_unique_hash(MI_UNIQUEDEF *def, const byte *record)
{
const byte *pos, *end;
- ha_checksum crc=0;
- HA_KEYSEG *keyseg;
+ ulong crc= 0;
ulong seed= 4;
+ HA_KEYSEG *keyseg;
for (keyseg=def->seg ; keyseg < def->end ; keyseg++)
{
@@ -118,7 +118,7 @@ ha_checksum mi_unique_hash(MI_UNIQUEDEF *def, const byte *record)
(((uchar) *(uchar*) pos++))) +
(crc >> (8*sizeof(ha_checksum)-8));
}
- return crc;
+ return (ha_checksum)crc;
}
/*