diff options
| author | unknown <dkatz@damien-katzs-computer.local> | 2007-05-17 20:50:29 -0400 |
|---|---|---|
| committer | unknown <dkatz@damien-katzs-computer.local> | 2007-05-17 20:50:29 -0400 |
| commit | b1a7ae7987e174379f93397504d43d7062a67352 (patch) | |
| tree | ee85596bc92ac6a4489d126374cb7ea63feb8c23 /sql/filesort.cc | |
| parent | 4e77a4cec4caf1dde8526d36a738be90684165e0 (diff) | |
| parent | c2d3fb6b204e93de25487d17b5d2598beb800225 (diff) | |
| download | mariadb-git-b1a7ae7987e174379f93397504d43d7062a67352.tar.gz | |
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into damien-katzs-computer.local:/Users/dkatz/mysql51
sql/filesort.cc:
Auto merged
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 7da3eeb028e..01ba3f06fc7 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -376,7 +376,7 @@ static BUFFPEK *read_buffpek_from_file(IO_CACHE *buffpek_pointers, uint count) ulong length; BUFFPEK *tmp; DBUG_ENTER("read_buffpek_from_file"); - if ((ulong)count > ULONG_MAX/sizeof(BUFFPEK)) + if (count > UINT_MAX/sizeof(BUFFPEK)) return 0; /* sizeof(BUFFPEK)*count will overflow */ tmp=(BUFFPEK*) my_malloc(length=sizeof(BUFFPEK)*count, MYF(MY_WME)); if (tmp) @@ -629,7 +629,7 @@ write_keys(SORTPARAM *param, register uchar **sort_keys, uint count, MYF(MY_WME))) goto err; /* purecov: inspected */ /* check we won't have more buffpeks than we can possibly keep in memory */ - if (my_b_tell(buffpek_pointers) + sizeof(BUFFPEK) > (ulonglong)ULONG_MAX) + if (my_b_tell(buffpek_pointers) + sizeof(BUFFPEK) > (ulonglong)UINT_MAX) goto err; buffpek.file_pos= my_b_tell(tempfile); if ((ha_rows) count > param->max_rows) |