diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
| commit | 5be4c3822691f8bca4c8444ccc77b4b01bc996c1 (patch) | |
| tree | a1ec5dfbd668a88bc0b6c98db397a421d2b37f21 /storage/myisam/mi_dynrec.c | |
| parent | 169f7da04c4ffc43355d5a632a8013bc4caea39b (diff) | |
| parent | 1ba25ae47caace207cda0be2b7994a1a845e6cce (diff) | |
| download | mariadb-git-5be4c3822691f8bca4c8444ccc77b4b01bc996c1.tar.gz | |
Merge from 5.0 for 43414
Diffstat (limited to 'storage/myisam/mi_dynrec.c')
| -rw-r--r-- | storage/myisam/mi_dynrec.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c index d1cbd6955dd..696b9ff93df 100644 --- a/storage/myisam/mi_dynrec.c +++ b/storage/myisam/mi_dynrec.c @@ -1419,16 +1419,14 @@ void _my_store_blob_length(uchar *pos,uint pack_length,uint length) int _mi_read_dynamic_record(MI_INFO *info, my_off_t filepos, uchar *buf) { int block_of_record; - uint b_type,left_length; - uchar *to; + uint b_type,UNINIT_VAR(left_length); + uchar *UNINIT_VAR(to); MI_BLOCK_INFO block_info; File file; DBUG_ENTER("mi_read_dynamic_record"); if (filepos != HA_OFFSET_ERROR) { - LINT_INIT(to); - LINT_INIT(left_length); file=info->dfile; block_of_record= 0; /* First block of record is numbered as zero. */ block_info.second_read= 0; @@ -1697,13 +1695,12 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, uchar *buf, { int block_of_record, info_read, save_errno; uint left_len,b_type; - uchar *to; + uchar *UNINIT_VAR(to); MI_BLOCK_INFO block_info; MYISAM_SHARE *share=info->s; DBUG_ENTER("_mi_read_rnd_dynamic_record"); info_read=0; - LINT_INIT(to); if (info->lock_type == F_UNLCK) { |