summaryrefslogtreecommitdiff
path: root/storage/archive/ha_archive.h
diff options
context:
space:
mode:
Diffstat (limited to 'storage/archive/ha_archive.h')
-rw-r--r--storage/archive/ha_archive.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h
index 8fc54f6715f..936bb6e253d 100644
--- a/storage/archive/ha_archive.h
+++ b/storage/archive/ha_archive.h
@@ -27,7 +27,7 @@
*/
typedef struct st_archive_record_buffer {
- byte *buffer;
+ uchar *buffer;
uint32 length;
} archive_record_buffer;
@@ -62,12 +62,12 @@ class ha_archive: public handler
azio_stream archive; /* Archive file we are working with */
my_off_t current_position; /* The position of the row we just read */
- byte byte_buffer[IO_SIZE]; /* Initial buffer for our string */
+ uchar byte_buffer[IO_SIZE]; /* Initial buffer for our string */
String buffer; /* Buffer used for blob storage */
ha_rows scan_rows; /* Number of rows left in scan */
bool delayed_insert; /* If the insert is delayed */
bool bulk_insert; /* If we are performing a bulk insert */
- const byte *current_key;
+ const uchar *current_key;
uint current_key_len;
uint current_k_offset;
archive_record_buffer *record_buffer;
@@ -101,29 +101,29 @@ public:
uint max_supported_key_length() const { return sizeof(ulonglong); }
uint max_supported_key_part_length() const { return sizeof(ulonglong); }
int index_init(uint keynr, bool sorted);
- virtual int index_read(byte * buf, const byte * key,
+ virtual int index_read(uchar * buf, const uchar * key,
uint key_len, enum ha_rkey_function find_flag);
- virtual int index_read_idx(byte * buf, uint index, const byte * key,
+ virtual int index_read_idx(uchar * buf, uint index, const uchar * key,
uint key_len, enum ha_rkey_function find_flag);
- int index_next(byte * buf);
+ int index_next(uchar * buf);
int open(const char *name, int mode, uint test_if_locked);
int close(void);
- int write_row(byte * buf);
- int real_write_row(byte *buf, azio_stream *writer);
+ int write_row(uchar * buf);
+ int real_write_row(uchar *buf, azio_stream *writer);
int delete_all_rows();
int rnd_init(bool scan=1);
- int rnd_next(byte *buf);
- int rnd_pos(byte * buf, byte *pos);
- int get_row(azio_stream *file_to_read, byte *buf);
- int get_row_version2(azio_stream *file_to_read, byte *buf);
- int get_row_version3(azio_stream *file_to_read, byte *buf);
+ int rnd_next(uchar *buf);
+ int rnd_pos(uchar * buf, uchar *pos);
+ int get_row(azio_stream *file_to_read, uchar *buf);
+ int get_row_version2(azio_stream *file_to_read, uchar *buf);
+ int get_row_version3(azio_stream *file_to_read, uchar *buf);
ARCHIVE_SHARE *get_share(const char *table_name, int *rc);
int free_share();
int init_archive_writer();
int init_archive_reader();
bool auto_repair() const { return 1; } // For the moment we just do this
int read_data_header(azio_stream *file_to_read);
- void position(const byte *record);
+ void position(const uchar *record);
int info(uint);
void update_create_info(HA_CREATE_INFO *create_info);
int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info);
@@ -140,9 +140,9 @@ public:
bool is_crashed() const;
int check(THD* thd, HA_CHECK_OPT* check_opt);
bool check_and_repair(THD *thd);
- uint32 max_row_length(const byte *buf);
+ uint32 max_row_length(const uchar *buf);
bool fix_rec_buff(unsigned int length);
- int unpack_row(azio_stream *file_to_read, byte *record);
- unsigned int pack_row(byte *record);
+ int unpack_row(azio_stream *file_to_read, uchar *record);
+ unsigned int pack_row(uchar *record);
};