database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint

Browse Source 
into  amd64.(none):/src/bug27029/my51-bug27029


storage/myisam/sort.c:
  Auto merged
This commit is contained in:
unknown
2007-06-21 12:53:03 -04:00
parent 02faba53a6 c5559f08cf
commit 772d158ee2
4 changed files with 100 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
storage/myisam/sort.c
View File

@@ -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