summaryrefslogtreecommitdiff
path: root/include/myisamchk.h
diff options
context:
space:
mode:
authorunknown <jani@hynda.mysql.fi>2007-07-02 20:45:15 +0300
committerunknown <jani@hynda.mysql.fi>2007-07-02 20:45:15 +0300
commit631ecaabea7336a8f28367c0d1c291f0433f7e88 (patch)
tree2eb68f1f6af5e60c4bcdd8fcfa7e14f3650de830 /include/myisamchk.h
parentcfdd73369c0c2d57908af8dc727de33567fe9e0b (diff)
downloadmariadb-git-631ecaabea7336a8f28367c0d1c291f0433f7e88.tar.gz
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.
Diffstat (limited to 'include/myisamchk.h')
-rw-r--r--include/myisamchk.h10
1 files changed, 5 insertions, 5 deletions
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 */