diff options
author | reggie@poseidon.ndb.mysql.com <> | 2005-11-07 17:15:23 +0100 |
---|---|---|
committer | reggie@poseidon.ndb.mysql.com <> | 2005-11-07 17:15:23 +0100 |
commit | 473dac3541fb62927d28c31e9f7ab2efb2ba4173 (patch) | |
tree | a7e98f5c30672b93068dfead6dd8ea455d00bb29 /sql/key.cc | |
parent | 98e20c9b4686b862a00b7368915927accf28192d (diff) | |
download | mariadb-git-473dac3541fb62927d28c31e9f7ab2efb2ba4173.tar.gz |
some small changes to help get 5.1 compiling cleanly on Windows and with Visual C++ 2005
Diffstat (limited to 'sql/key.cc')
-rw-r--r-- | sql/key.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/key.cc b/sql/key.cc index 731df134efa..4af88f218ee 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -461,7 +461,7 @@ int key_rec_cmp(void *key, byte *first_rec, byte *second_rec) uint key_parts= key_info->key_parts, i= 0; KEY_PART_INFO *key_part= key_info->key_part; char *rec0= key_part->field->ptr - key_part->offset; - my_ptrdiff_t first_diff= first_rec - rec0, sec_diff= second_rec - rec0; + my_ptrdiff_t first_diff= first_rec - (byte*)rec0, sec_diff= second_rec - (byte*)rec0; int result= 0; DBUG_ENTER("key_rec_cmp"); |