summaryrefslogtreecommitdiff
path: root/heap/hp_write.c
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2009-09-17 17:10:30 +0200
committerStaale Smedseng <staale.smedseng@sun.com>2009-09-17 17:10:30 +0200
commite5888b16afcef42e8127a815cc5a95abc283c6d9 (patch)
tree3cf056e46acab4ed88aecfc3171b43e75db69e48 /heap/hp_write.c
parent3dea04c58bf665d98e3bbdb12a6386c5920c1b77 (diff)
downloadmariadb-git-e5888b16afcef42e8127a815cc5a95abc283c6d9.tar.gz
Bug #43414 Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2 This is the fifth patch cleaning up more GCC warnings about variables used before initialized using the new macro UNINIT_VAR().
Diffstat (limited to 'heap/hp_write.c')
-rw-r--r--heap/hp_write.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/heap/hp_write.c b/heap/hp_write.c
index 6aa34acf2c3..85551c1cc41 100644
--- a/heap/hp_write.c
+++ b/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;
- byte *ptr_to_rec,*ptr_to_rec2;
- HASH_INFO *empty,*gpos,*gpos2,*pos;
+ byte *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 */