diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-04 08:43:56 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-04 08:43:56 +0100 |
| commit | a30e87414c3d3bdb04d953e98853b5c07c370122 (patch) | |
| tree | 8e6a210bdde7b2cef8876ae4e07ed1882d4eb55c /storage/myisam | |
| parent | ba55e5e02b258c43cb87a00a221bacd0d83f29c0 (diff) | |
| parent | 00ba619106ca11aef27b8203fc03da2ec6c96409 (diff) | |
| download | mariadb-git-a30e87414c3d3bdb04d953e98853b5c07c370122.tar.gz | |
merge 10.0-base into 10.0
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/sort.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c index 3d68b486f00..8e45ca1a3ea 100644 --- a/storage/myisam/sort.c +++ b/storage/myisam/sort.c @@ -542,7 +542,8 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) { MI_SORT_INFO *sort_info=sort_param->sort_info; HA_CHECK *param=sort_info->param; - ulong UNINIT_VAR(length), keys; + ulonglong UNINIT_VAR(length); + ha_rows keys; ulong *rec_per_key_part=param->rec_per_key_part; int got_error=sort_info->got_error; uint i; |