diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-13 13:42:38 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-13 13:42:38 +0400 |
| commit | c69629d269fcab948800a427eff587b68cd7cf34 (patch) | |
| tree | e56ffd06670e5f719dc7c91ca477eb50aa578a24 /storage/heap/hp_write.c | |
| parent | eddd727a3a3de0e27e921551263e18c0b558a8ca (diff) | |
| parent | 85bb4aa09ee906c5cb8a3f7af8ff319e3a6c93b9 (diff) | |
| download | mariadb-git-c69629d269fcab948800a427eff587b68cd7cf34.tar.gz | |
Merge from mysql-5.1.
Diffstat (limited to 'storage/heap/hp_write.c')
| -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 */ |