diff options
| author | unknown <iggy@amd64.(none)> | 2007-06-21 12:52:20 -0400 |
|---|---|---|
| committer | unknown <iggy@amd64.(none)> | 2007-06-21 12:52:20 -0400 |
| commit | 2e8357b4a7ad33ca2e9b16e31fb940ae7d3e5a7b (patch) | |
| tree | cdd67f4b72db4c76ed318460b653b00d231eb6e8 /myisam | |
| parent | e0e739b628588d5856ab634654347edae21880dd (diff) | |
| parent | c3e4b61c4eb9e2bae1137ed4c503c6f8bb33dc5d (diff) | |
| download | mariadb-git-2e8357b4a7ad33ca2e9b16e31fb940ae7d3e5a7b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into amd64.(none):/src/bug27029/my50-bug27029
myisam/sort.c:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/sort.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index f918283503e..f48161b7c8e 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -138,8 +138,9 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, while (memavl >= MIN_SORT_MEMORY) { - if ((my_off_t) (records+1)*(sort_length+sizeof(char*)) <= - (my_off_t) memavl) + if ((records < UINT_MAX32) && + ((my_off_t) (records + 1) * + (sort_length + sizeof(char*)) <= (my_off_t) memavl)) keys= records+1; else do |