Commit d5880298 authored by unknown's avatar unknown
Browse files

after merge fix 


myisam/mi_unique.c:
  warning removed
parent e9242d68

myisam/mi_unique.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}



	/*

sql/field.cc

+2 −3
Original line number Diff line number Diff line
@@ -4242,8 +4242,7 @@ 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,

  return my_strnncoll(field_charset,(const uchar*) a_ptr, field_length,

                                    (const uchar*) b_ptr, field_length);

}