diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-09-17 17:25:52 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-09-17 17:25:52 +0200 |
| commit | d6ca0cbb23544e2e033f512f400a91ce6245a9a4 (patch) | |
| tree | 0320f9cfba455c1d3cb00160205b3412461fffb3 /storage/heap | |
| parent | 2535ede7138cb4d1e8986d18b4154c377ba37f3f (diff) | |
| parent | e5888b16afcef42e8127a815cc5a95abc283c6d9 (diff) | |
| download | mariadb-git-d6ca0cbb23544e2e033f512f400a91ce6245a9a4.tar.gz | |
Merge from 5.0
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/hp_write.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/storage/heap/hp_write.c b/storage/heap/hp_write.c index c3dff67d3d5..fe83fb1e8e7 100644 --- a/storage/heap/hp_write.c +++ b/storage/heap/hp_write.c @@ -196,13 +196,10 @@ int hp_write_key(HP_INFO *info, HP_KEYDEF *keyinfo, HP_SHARE *share = info->s; int flag; ulong halfbuff,hashnr,first_index; - uchar *ptr_to_rec,*ptr_to_rec2; - HASH_INFO *empty,*gpos,*gpos2,*pos; + uchar *UNINIT_VAR(ptr_to_rec),*UNINIT_VAR(ptr_to_rec2); + HASH_INFO *empty,*UNINIT_VAR(gpos),*UNINIT_VAR(gpos2),*pos; DBUG_ENTER("hp_write_key"); - LINT_INIT(gpos); LINT_INIT(gpos2); - LINT_INIT(ptr_to_rec); LINT_INIT(ptr_to_rec2); - flag=0; if (!(empty= hp_find_free_hash(share,&keyinfo->block,share->records))) DBUG_RETURN(-1); /* No more memory */ |