diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
| commit | 506c7fd47dd28e5726852e47d117bfbb37677005 (patch) | |
| tree | 796cc97d1d103e18e0672d9b57dee4c54857073c /storage/heap | |
| parent | 4557f4ee9e9975966be6fa7c4fa553b30992ca6d (diff) | |
| parent | fbb96b339ae5fcce19446fd27a2fb75e49b960f8 (diff) | |
| download | mariadb-git-506c7fd47dd28e5726852e47d117bfbb37677005.tar.gz | |
Merge MySQL 5.1.35 into MySQL 5.4
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/hp_write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/heap/hp_write.c b/storage/heap/hp_write.c index 2abef2d9b43..c3dff67d3d5 100644 --- a/storage/heap/hp_write.c +++ b/storage/heap/hp_write.c @@ -69,7 +69,7 @@ int heap_write(HP_INFO *info, const uchar *record) err: if (my_errno == HA_ERR_FOUND_DUPP_KEY) DBUG_PRINT("info",("Duplicate key: %d", (int) (keydef - share->keydef))); - info->errkey= keydef - share->keydef; + info->errkey= (int) (keydef - share->keydef); /* We don't need to delete non-inserted key from rb-tree. Also, if we got ENOMEM, the key wasn't inserted, so don't try to delete it |