bk commit into 5.1 tree (kaa:1.2660)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-10 15:07:55+03:00, kaa@kaamos.(none) +1 -0
  Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'.

  sql/filesort.cc@stripped, 2008-01-10 15:07:54+03:00, kaa@kaamos.(none) +6 -6
    Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'.

diff -Nrup a/sql/filesort.cc b/sql/filesort.cc
--- a/sql/filesort.cc	2008-01-10 14:35:10 +03:00
+++ b/sql/filesort.cc	2008-01-10 15:07:54 +03:00
@@ -37,8 +37,8 @@ if (my_b_write((file),(uchar*) (from),pa
 
 static char **make_char_array(char **old_pos, register uint fields,
                               uint length, myf my_flag);
-static byte *read_buffpek_from_file(IO_CACHE *buffer_file, uint count,
-                                    byte *buf);
+static uchar *read_buffpek_from_file(IO_CACHE *buffer_file, uint count,
+                                     uchar *buf);
 static ha_rows find_all_keys(SORTPARAM *param,SQL_SELECT *select,
 			     uchar * *sort_keys, IO_CACHE *buffer_file,
 			     IO_CACHE *tempfile,IO_CACHE *indexfile);
@@ -376,16 +376,16 @@ static char **make_char_array(char **old
 
 /* Read 'count' number of buffer pointers into memory */
 
-static byte *read_buffpek_from_file(IO_CACHE *buffpek_pointers, uint count,
-                                    byte *buf)
+static uchar *read_buffpek_from_file(IO_CACHE *buffpek_pointers, uint count,
+                                     uchar *buf)
 {
   ulong length= sizeof(BUFFPEK)*count;
-  byte *tmp= buf;
+  uchar *tmp= buf;
   DBUG_ENTER("read_buffpek_from_file");
   if (count > UINT_MAX/sizeof(BUFFPEK))
     return 0; /* sizeof(BUFFPEK)*count will overflow */
   if (!tmp)
-    tmp= (byte *)my_malloc(length, MYF(MY_WME));
+    tmp= (uchar *)my_malloc(length, MYF(MY_WME));
   if (tmp)
   {
     if (reinit_io_cache(buffpek_pointers,READ_CACHE,0L,0,0) ||