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/sort.c | |
| parent | 169f7da04c4ffc43355d5a632a8013bc4caea39b (diff) | |
| parent | 1ba25ae47caace207cda0be2b7994a1a845e6cce (diff) | |
| download | mariadb-git-5be4c3822691f8bca4c8444ccc77b4b01bc996c1.tar.gz | |
Merge from 5.0 for 43414
Diffstat (limited to 'storage/myisam/sort.c')
| -rw-r--r-- | storage/myisam/sort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c index d505d2633ce..f31edbe1249 100644 --- a/storage/myisam/sort.c +++ b/storage/myisam/sort.c @@ -489,7 +489,7 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) { SORT_INFO *sort_info=sort_param->sort_info; MI_CHECK *param=sort_info->param; - ulong length, keys; + ulong UNINIT_VAR(length), keys; ulong *rec_per_key_part=param->rec_per_key_part; int got_error=sort_info->got_error; uint i; @@ -896,7 +896,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file, int error; uint sort_length,maxcount; ha_rows count; - my_off_t to_start_filepos; + my_off_t UNINIT_VAR(to_start_filepos); uchar *strpos; BUFFPEK *buffpek,**refpek; QUEUE queue; |