diff options
| author | unknown <serg@serg.mylan> | 2004-06-11 21:20:53 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-06-11 21:20:53 +0200 |
| commit | 6b5907e2dd6ad7c6481e93fc8c108bfeeed5fd7d (patch) | |
| tree | 6c64f2363a9bbe8a71b9853a4f17c6a46d72e511 | |
| parent | fae2a87f5c07881d3752e79b9a50102bb66560c1 (diff) | |
| download | mariadb-git-6b5907e2dd6ad7c6481e93fc8c108bfeeed5fd7d.tar.gz | |
after merge fix
myisam/mi_unique.c:
warning removed
| -rw-r--r-- | myisam/mi_unique.c | 6 | ||||
| -rw-r--r-- | sql/field.cc | 5 |
2 files changed, 5 insertions, 6 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; } /* diff --git a/sql/field.cc b/sql/field.cc index df9b4f84ae7..0660e774396 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4242,9 +4242,8 @@ int Field_string::cmp(const char *a_ptr, const char *b_ptr) (const uchar*) b_ptr, field_length); } - return field_charset->coll->strnncoll(field_charset, - (const uchar*) a_ptr, field_length, - (const uchar*) b_ptr, field_length); + return my_strnncoll(field_charset,(const uchar*) a_ptr, field_length, + (const uchar*) b_ptr, field_length); } void Field_string::sort_string(char *to,uint length) |