Merged with mysql-5.1 main tree.

BUILD/compile-pentium-debug-max:
  Added definition after macro was removed from main tree. This will
  be fixed back in main tree later.

5 files changed, 48 insertions, 48 deletions

diff --git a/include/lf.h b/include/lf.h
index 4712f9c4862..8d26efd1232 100644
--- a/include/lf.h
+++ b/include/lf.h
@@ -206,7 +206,7 @@ uint lf_alloc_pool_count(LF_ALLOCATOR *allocator);
 #define lf_alloc_get_pins(A, ST)       lf_pinbox_get_pins(&(A)->pinbox, (ST))
 #define _lf_alloc_put_pins(PINS)      _lf_pinbox_put_pins(PINS)
 #define lf_alloc_put_pins(PINS)        lf_pinbox_put_pins(PINS)
-#define lf_alloc_direct_free(ALLOC, ADDR) my_free((gptr)(ADDR), MYF(0))
+#define lf_alloc_direct_free(ALLOC, ADDR) my_free((uchar*)(ADDR), MYF(0))
 
 lock_wrap(lf_alloc_new, void *,
           (LF_PINS *pins),
diff --git a/include/maria.h b/include/maria.h
index 5f8e3dcdd41..9dd6e077666 100644
--- a/include/maria.h
+++ b/include/maria.h
@@ -179,18 +179,18 @@ typedef struct st_maria_keydef          /* Key definition with open & info */
   HA_KEYSEG *seg, *end;
   struct st_mysql_ftparser *parser;     /* Fulltext [pre]parser */
   int (*bin_search)(struct st_maria_info *info,
-		    struct st_maria_keydef *keyinfo, byte *page, byte *key,
-		    uint key_len, uint comp_flag, byte **ret_pos,
-		    byte *buff, my_bool *was_last_key);
+		    struct st_maria_keydef *keyinfo, uchar *page, uchar *key,
+		    uint key_len, uint comp_flag, uchar **ret_pos,
+		    uchar *buff, my_bool *was_last_key);
     uint(*get_key)(struct st_maria_keydef *keyinfo, uint nod_flag,
-                   byte **page, byte *key);
+                   uchar **page, uchar *key);
   int (*pack_key)(struct st_maria_keydef *keyinfo, uint nod_flag,
-		  byte *next_key, byte *org_key, byte *prev_key,
-		  const byte *key, struct st_maria_s_param *s_temp);
-  void (*store_key)(struct st_maria_keydef *keyinfo, byte *key_pos,
+		  uchar *next_key, uchar *org_key, uchar *prev_key,
+		  const uchar *key, struct st_maria_s_param *s_temp);
+  void (*store_key)(struct st_maria_keydef *keyinfo, uchar *key_pos,
 		    struct st_maria_s_param *s_temp);
-  int (*ck_insert)(struct st_maria_info *inf, uint k_nr, byte *k, uint klen);
-  int (*ck_delete)(struct st_maria_info *inf, uint k_nr, byte *k, uint klen);
+  int (*ck_insert)(struct st_maria_info *inf, uint k_nr, uchar *k, uint klen);
+  int (*ck_delete)(struct st_maria_info *inf, uint k_nr, uchar *k, uint klen);
 } MARIA_KEYDEF;
 
 
@@ -208,7 +208,7 @@ typedef struct st_maria_decode_tree     /* Decode huff-table */
 {
   uint16 *table;
   uint quick_table_bits;
-  byte *intervalls;
+  uchar *intervalls;
 } MARIA_DECODE_TREE;
 
 
@@ -236,7 +236,7 @@ typedef struct st_maria_columndef		/* column information */
 #ifndef NOT_PACKED_DATABASES
   void(*unpack)(struct st_maria_columndef *rec,
                 struct st_maria_bit_buff *buff,
-                byte *start, byte *end);
+                uchar *start, uchar *end);
   enum en_fieldtype base_type;
   uint space_length_bits, pack_type;
   MARIA_DECODE_TREE *huff_tree;
@@ -258,30 +258,30 @@ extern PAGECACHE maria_pagecache_var, *maria_pagecache;
 extern int maria_init(void);
 extern void maria_end(void);
 extern int maria_close(struct st_maria_info *file);
-extern int maria_delete(struct st_maria_info *file, const byte *buff);
+extern int maria_delete(struct st_maria_info *file, const uchar *buff);
 extern struct st_maria_info *maria_open(const char *name, int mode,
 					uint wait_if_locked);
 extern struct st_maria_info *maria_clone(struct st_maria_share *share, int mode);
 extern int maria_panic(enum ha_panic_function function);
-extern int maria_rfirst(struct st_maria_info *file, byte *buf, int inx);
-extern int maria_rkey(struct st_maria_info *file, byte *buf, int inx,
-		      const byte *key,
+extern int maria_rfirst(struct st_maria_info *file, uchar *buf, int inx);
+extern int maria_rkey(struct st_maria_info *file, uchar *buf, int inx,
+		      const uchar *key,
 		      uint key_len, enum ha_rkey_function search_flag);
-extern int maria_rlast(struct st_maria_info *file, byte *buf, int inx);
-extern int maria_rnext(struct st_maria_info *file, byte *buf, int inx);
-extern int maria_rnext_same(struct st_maria_info *info, byte *buf);
-extern int maria_rprev(struct st_maria_info *file, byte *buf, int inx);
-extern int maria_rrnd(struct st_maria_info *file, byte *buf,
+extern int maria_rlast(struct st_maria_info *file, uchar *buf, int inx);
+extern int maria_rnext(struct st_maria_info *file, uchar *buf, int inx);
+extern int maria_rnext_same(struct st_maria_info *info, uchar *buf);
+extern int maria_rprev(struct st_maria_info *file, uchar *buf, int inx);
+extern int maria_rrnd(struct st_maria_info *file, uchar *buf,
                       MARIA_RECORD_POS pos);
 extern int maria_scan_init(struct st_maria_info *file);
-extern int maria_scan(struct st_maria_info *file, byte *buf);
+extern int maria_scan(struct st_maria_info *file, uchar *buf);
 extern void maria_scan_end(struct st_maria_info *file);
-extern int maria_rsame(struct st_maria_info *file, byte *record, int inx);
-extern int maria_rsame_with_pos(struct st_maria_info *file, byte *record,
+extern int maria_rsame(struct st_maria_info *file, uchar *record, int inx);
+extern int maria_rsame_with_pos(struct st_maria_info *file, uchar *record,
 				int inx, MARIA_RECORD_POS pos);
-extern int maria_update(struct st_maria_info *file, const byte *old,
-			byte *new_record);
-extern int maria_write(struct st_maria_info *file, byte *buff);
+extern int maria_update(struct st_maria_info *file, const uchar *old,
+			uchar *new_record);
+extern int maria_write(struct st_maria_info *file, uchar *buff);
 extern MARIA_RECORD_POS maria_position(struct st_maria_info *file);
 extern int maria_status(struct st_maria_info *info, MARIA_INFO *x, uint flag);
 extern int maria_lock_database(struct st_maria_info *file, int lock_type);
@@ -348,8 +348,8 @@ typedef struct st_maria_sort_param
   MARIA_KEYDEF *keyinfo;
   MARIA_SORT_INFO *sort_info;
   HA_KEYSEG *seg;
-  byte **sort_keys;
-  byte *rec_buff;
+  uchar **sort_keys;
+  uchar *rec_buff;
   void *wordlist, *wordptr;
   MEM_ROOT wordroot;
   char *record;
@@ -367,13 +367,13 @@ typedef struct st_maria_sort_param
   uint maxbuffers, keys, find_length, sort_keys_length;
   my_bool fix_datafile, master;
   my_bool calc_checksum;                /* calculate table checksum */
-  my_size_t rec_buff_size;
+  size_t rec_buff_size;
 
   int (*key_cmp)(struct st_maria_sort_param *, const void *, const void *);
-  int (*key_read)(struct st_maria_sort_param *, byte *);
-  int (*key_write)(struct st_maria_sort_param *, const byte *);
+  int (*key_read)(struct st_maria_sort_param *, uchar *);
+  int (*key_write)(struct st_maria_sort_param *, const uchar *);
   void (*lock_in_memory)(HA_CHECK *);
-  NEAR int (*write_keys)(struct st_maria_sort_param *, register byte **,
+  NEAR int (*write_keys)(struct st_maria_sort_param *, register uchar **,
                          uint , struct st_buffpek *, IO_CACHE *);
   NEAR uint (*read_to_buffer)(IO_CACHE *,struct st_buffpek *, uint);
   NEAR int (*write_key)(struct st_maria_sort_param *, IO_CACHE *,char *,
@@ -389,9 +389,9 @@ int maria_chk_size(HA_CHECK *param, MARIA_HA *info);
 int maria_chk_key(HA_CHECK *param, MARIA_HA *info);
 int maria_chk_data_link(HA_CHECK *param, MARIA_HA *info, int extend);
 int maria_repair(HA_CHECK *param, register MARIA_HA *info,
-		 my_string name, int rep_quick);
+		 char * name, int rep_quick);
 int maria_sort_index(HA_CHECK *param, register MARIA_HA *info,
-		     my_string name);
+		     char * name);
 int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info,
 			 const char *name, int rep_quick);
 int maria_repair_parallel(HA_CHECK *param, register MARIA_HA *info,
@@ -405,7 +405,7 @@ void maria_update_key_parts(MARIA_KEYDEF *keyinfo, ulong *rec_per_key_part,
                             ulonglong records);
 int maria_filecopy(HA_CHECK *param, File to, File from, my_off_t start,
                    my_off_t length, const char *type);
-int maria_movepoint(MARIA_HA *info, byte *record, my_off_t oldpos,
+int maria_movepoint(MARIA_HA *info, uchar *record, my_off_t oldpos,
                     my_off_t newpos, uint prot_key);
 int maria_write_data_suffix(MARIA_SORT_INFO *sort_info, my_bool fix_datafile);
 int maria_test_if_almost_full(MARIA_HA *info);
@@ -427,8 +427,8 @@ void maria_change_pagecache(PAGECACHE *old_key_cache,
 int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves);
 
 /* fulltext functions */
-FT_INFO *maria_ft_init_search(uint,void *, uint, byte *, uint,
-                              CHARSET_INFO *, byte *);
+FT_INFO *maria_ft_init_search(uint,void *, uint, uchar *, uint,
+                              CHARSET_INFO *, uchar *);
 
 /* 'Almost-internal' Maria functions */
 
diff --git a/include/my_sys.h b/include/my_sys.h
index a9c7b1dd549..9148d0cf29b 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -717,12 +717,12 @@ extern void handle_recived_signals(void);
 extern sig_handler my_set_alarm_variable(int signo);
 extern void my_string_ptr_sort(uchar *base,uint items,size_t size);
 extern void radixsort_for_str_ptr(uchar* base[], uint number_of_elements,
-				  size_s size_of_element,uchar *buffer[]);
+				  size_t size_of_element,uchar *buffer[]);
 extern qsort_t qsort2(void *base_ptr, size_t total_elems, size_t size,
 		      qsort2_cmp cmp, void *cmp_argument);
 extern qsort2_cmp get_ptr_compare(size_t);
 void my_store_ptr(uchar *buff, size_t pack_length, my_off_t pos);
-my_off_t my_get_ptr(cuhar *ptr, size_t pack_length);
+my_off_t my_get_ptr(uchar *ptr, size_t pack_length);
 extern int init_io_cache(IO_CACHE *info,File file,size_t cachesize,
 			 enum cache_type type,my_off_t seek_offset,
 			 pbool use_async_io, myf cache_myflags);
@@ -840,11 +840,11 @@ extern void free_defaults(char **argv);
 extern void my_print_default_files(const char *conf_file);
 extern void print_defaults(const char *conf_file, const char **groups);
 extern my_bool my_compress(uchar *, size_t *, size_t *);
-extern my_bool my_uncompress(uchar *, size_t *, size_t *);
+extern my_bool my_uncompress(uchar *, size_t , size_t *);
 extern uchar *my_compress_alloc(const uchar *packet, size_t *len,
                                 size_t *complen);
 extern int packfrm(const uchar *, size_t, uchar **, size_t *);
-extern int unpackfrm(const uchar **, size_t *, const uchar *);
+extern int unpackfrm(uchar **, size_t *, const uchar *);
 
 extern ha_checksum my_checksum(ha_checksum crc, const uchar *mem,
                                size_t count);
diff --git a/include/myisam.h b/include/myisam.h
index 2ec083c3e12..154a3d95b41 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -338,7 +338,7 @@ typedef struct st_mi_sort_param
   MI_SORT_INFO *sort_info;
   HA_KEYSEG *seg;
   uchar **sort_keys;
-  byte *rec_buff;
+  uchar *rec_buff;
   void *wordlist, *wordptr;
   MEM_ROOT wordroot;
   char *record;
diff --git a/include/myisamchk.h b/include/myisamchk.h
index 887cf835b87..78350b60bb0 100644
--- a/include/myisamchk.h
+++ b/include/myisamchk.h
@@ -76,8 +76,8 @@
 
 typedef struct st_sort_key_blocks		/* Used when sorting */
 {
-  byte *buff, *end_pos;
-  byte lastkey[HA_MAX_POSSIBLE_KEY_BUFF];
+  uchar *buff, *end_pos;
+  uchar lastkey[HA_MAX_POSSIBLE_KEY_BUFF];
   uint last_length;
   int inited;
 } SORT_KEY_BLOCKS;
@@ -147,15 +147,15 @@ typedef struct st_handler_check_param
 
 typedef struct st_sort_ftbuf
 {
-  byte *buf, *end;
+  uchar *buf, *end;
   int count;
-  byte lastkey[HA_MAX_KEY_BUFF];
+  uchar lastkey[HA_MAX_KEY_BUFF];
 } SORT_FT_BUF;
 
 
 typedef struct st_buffpek {
   my_off_t file_pos;                    /* Where we are in the sort file */
-  byte *base, *key;                     /* Key pointers */
+  uchar *base, *key;                    /* Key pointers */
   ha_rows count;                        /* Number of rows in table */
   ulong mem_count;                      /* numbers of keys in memory */
   ulong max_keys;                       /* Max keys in buffert */