diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-14 12:25:39 +0400 |
| commit | ca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d (patch) | |
| tree | 1b3260f72106f50b182546dff41127a389144fa1 /storage/heap | |
| parent | 946dc457facc58517e9c47f1c5ad0029e529da79 (diff) | |
| parent | 32e51de7f58d6f3e82c97fe9ab37d8d8246b762b (diff) | |
| download | mariadb-git-ca08f10ccd20213ad2ac1fa19f19cd7dfbcc5d7d.tar.gz | |
Manual merge from mysql-trunk-merge.
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 */ |