diff options
| author | unknown <sergefp@mysql.com> | 2007-07-11 15:16:54 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2007-07-11 15:16:54 +0400 |
| commit | 70dc2448411dadd984e08e98aaa1e07889c40643 (patch) | |
| tree | f12eb83e240a054b44aa16890dab5f54e80cb749 /sql/filesort.cc | |
| parent | 33e556ff5562212746011e1c1232d3dbd00f59a2 (diff) | |
| download | mariadb-git-70dc2448411dadd984e08e98aaa1e07889c40643.tar.gz | |
BUG#29610: crash in func_group on 64bit platform:
- make merge_buffers():sort_length have type size_t as this type is
expected by, e.g. ptr_compare_1, which will receive pointer to
sort_length as comparison parameter.
sql/filesort.cc:
BUG#29610: crash in func_group on 64bit platform:
- make sort_length have type size_t as this type is expected by, e.g.
ptr_compare_1, which will receive pointer to sort_length as comparison
parameter.
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index e547940797b..b6a5d844eac 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -1120,7 +1120,8 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file, int flag) { int error; - uint rec_length,sort_length,res_length,offset; + uint rec_length,res_length,offset; + size_t sort_length; ulong maxcount; ha_rows max_rows,org_max_rows; my_off_t to_start_filepos; |