database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0

Browse Source 
into  mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1
This commit is contained in:
svoj@mysql.com
2005-08-02 12:12:37 +05:00
parent ca56883011 19fe33e16c
commit 0f98bf44ef
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
myisam/sort.c
View File

@ -587,13 +587,15 @@ int thr_write_keys(MI_SORT_PARAM *sort_param)
while (!got_error &&
!my_b_read(&sinfo->tempfile_for_exceptions,(byte*)&key_length,
sizeof(key_length)) &&
!my_b_read(&sinfo->tempfile_for_exceptions,(byte*)mergebuf,
(uint) key_length))
sizeof(key_length)))
{
if (_mi_ck_write(info,sinfo->key,(uchar*) mergebuf,
key_length - info->s->rec_reflength))
got_error=1;
byte ft_buf[HA_FT_MAXLEN + HA_FT_WLEN + 10];
if (key_length > sizeof(ft_buf) ||
my_b_read(&sinfo->tempfile_for_exceptions, (byte*)ft_buf,
(uint)key_length) ||
_mi_ck_write(info, sinfo->key, (uchar*)ft_buf,
key_length - info->s->rec_reflength))
got_error=1;
}
}
}