1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'.

Browse Source
This commit is contained in:
unknown 2008-01-10 15:07:55 +03:00
parent 1040bea9ae
commit 0c49363d1e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sql/filesort.cc
View File

@ -37,8 +37,8 @@ if (my_b_write((file),(uchar*) (from),param->ref_length)) \
static char **make_char_array(char **old_pos, register uint fields, static char **make_char_array(char **old_pos, register uint fields,
uint length, myf my_flag); uint length, myf my_flag);
static byte *read_buffpek_from_file(IO_CACHE *buffer_file, uint count, static uchar *read_buffpek_from_file(IO_CACHE *buffer_file, uint count,
byte *buf); uchar *buf);
static ha_rows find_all_keys(SORTPARAM *param,SQL_SELECT *select, static ha_rows find_all_keys(SORTPARAM *param,SQL_SELECT *select,
uchar * *sort_keys, IO_CACHE *buffer_file, uchar * *sort_keys, IO_CACHE *buffer_file,
IO_CACHE *tempfile,IO_CACHE *indexfile); IO_CACHE *tempfile,IO_CACHE *indexfile);
@ -376,16 +376,16 @@ static char **make_char_array(char **old_pos, register uint fields,
/* Read 'count' number of buffer pointers into memory */ /* Read 'count' number of buffer pointers into memory */
static byte *read_buffpek_from_file(IO_CACHE *buffpek_pointers, uint count, static uchar *read_buffpek_from_file(IO_CACHE *buffpek_pointers, uint count,
byte *buf) uchar *buf)
{ {
ulong length= sizeof(BUFFPEK)*count; ulong length= sizeof(BUFFPEK)*count;
byte *tmp= buf; uchar *tmp= buf;
DBUG_ENTER("read_buffpek_from_file"); DBUG_ENTER("read_buffpek_from_file");
if (count > UINT_MAX/sizeof(BUFFPEK)) if (count > UINT_MAX/sizeof(BUFFPEK))
return 0; /* sizeof(BUFFPEK)*count will overflow */ return 0; /* sizeof(BUFFPEK)*count will overflow */
if (!tmp) if (!tmp)
tmp= (byte *)my_malloc(length, MYF(MY_WME)); tmp= (uchar *)my_malloc(length, MYF(MY_WME));
if (tmp) if (tmp)
{ {
if (reinit_io_cache(buffpek_pointers,READ_CACHE,0L,0,0) || if (reinit_io_cache(buffpek_pointers,READ_CACHE,0L,0,0) ||