diff options
author | unknown <ndbdev@dl145b.mysql.com> | 2005-06-15 20:07:31 +0200 |
---|---|---|
committer | unknown <ndbdev@dl145b.mysql.com> | 2005-06-15 20:07:31 +0200 |
commit | 634a6bebedd690d884daf7b0ccc2f181afaf3350 (patch) | |
tree | d7d1e5fc0e2c71cdea39f6dcfc07949843391d24 /storage/heap/hp_hash.c | |
parent | a9ba149a4ffbcdd925ccf83de8910e103fb828b2 (diff) | |
parent | fc465d1497ce598d07ec75eeaafc7ca84b578ee6 (diff) | |
download | mariadb-git-634a6bebedd690d884daf7b0ccc2f181afaf3350.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysys/default.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/heap/hp_hash.c:
Auto merged
storage/heap/hp_update.c:
Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'storage/heap/hp_hash.c')
-rw-r--r-- | storage/heap/hp_hash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/heap/hp_hash.c b/storage/heap/hp_hash.c index 7f02eb587a8..9e4636ebdc0 100644 --- a/storage/heap/hp_hash.c +++ b/storage/heap/hp_hash.c @@ -778,7 +778,7 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key, key+= seg->length; } memcpy(key, &recpos, sizeof(byte*)); - return key - start_key; + return (uint) (key - start_key); } @@ -844,7 +844,7 @@ uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, key+= seg->length; k_len-= seg->length; } - return key - start_key; + return (uint) (key - start_key); } @@ -866,7 +866,7 @@ uint hp_rb_null_key_length(HP_KEYDEF *keydef, const byte *key) continue; key+= seg->length; } - return key - start_key; + return (uint) (key - start_key); } @@ -886,7 +886,7 @@ uint hp_rb_var_key_length(HP_KEYDEF *keydef, const byte *key) } key+= length; } - return key - start_key; + return (uint) (key - start_key); } |