diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 18:57:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 18:57:00 +0300 |
| commit | 624dd71b9419555eca8baadc695e3376de72286f (patch) | |
| tree | 31aaab8aeac43f921638407ab82190dd05a72793 /storage/archive | |
| parent | d4d865fcc8083782b6e4419c69bec372cd0b4142 (diff) | |
| parent | e9c1701e11e2441435223cc7c00c467f58aaff19 (diff) | |
| download | mariadb-git-624dd71b9419555eca8baadc695e3376de72286f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 8 | ||||
| -rw-r--r-- | storage/archive/ha_archive.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index b62f78ad318..0b352589fe3 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -370,7 +370,7 @@ int Archive_share::write_v1_metafile() @return Length of packed row */ -unsigned int ha_archive::pack_row_v1(uchar *record) +unsigned int ha_archive::pack_row_v1(const uchar *record) { uint *blob, *end; uchar *pos; @@ -867,7 +867,7 @@ error: /* This is where the actual row is written out. */ -int ha_archive::real_write_row(uchar *buf, azio_stream *writer) +int ha_archive::real_write_row(const uchar *buf, azio_stream *writer) { my_off_t written; unsigned int r_pack_length; @@ -916,7 +916,7 @@ uint32 ha_archive::max_row_length(const uchar *record) } -unsigned int ha_archive::pack_row(uchar *record, azio_stream *writer) +unsigned int ha_archive::pack_row(const uchar *record, azio_stream *writer) { uchar *ptr; my_ptrdiff_t const rec_offset= record - table->record[0]; @@ -958,7 +958,7 @@ unsigned int ha_archive::pack_row(uchar *record, azio_stream *writer) for implementing start_bulk_insert() is that we could skip setting dirty to true each time. */ -int ha_archive::write_row(uchar *buf) +int ha_archive::write_row(const uchar *buf) { int rc; uchar *read_buf= NULL; diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h index 043eab2670a..b9fcf10f96f 100644 --- a/storage/archive/ha_archive.h +++ b/storage/archive/ha_archive.h @@ -95,7 +95,7 @@ class ha_archive: public handler void destroy_record_buffer(archive_record_buffer *r); int frm_copy(azio_stream *src, azio_stream *dst); int frm_compare(azio_stream *src); - unsigned int pack_row_v1(uchar *record); + unsigned int pack_row_v1(const uchar *record); public: ha_archive(handlerton *hton, TABLE_SHARE *table_arg); @@ -131,8 +131,8 @@ public: int index_next(uchar * buf); int open(const char *name, int mode, uint test_if_locked); int close(void); - int write_row(uchar * buf); - int real_write_row(uchar *buf, azio_stream *writer); + int write_row(const uchar * buf); + int real_write_row(const uchar *buf, azio_stream *writer); int truncate(); int rnd_init(bool scan=1); int rnd_next(uchar *buf); @@ -168,7 +168,7 @@ public: uint32 max_row_length(const uchar *buf); bool fix_rec_buff(unsigned int length); int unpack_row(azio_stream *file_to_read, uchar *record); - unsigned int pack_row(uchar *record, azio_stream *writer); + unsigned int pack_row(const uchar *record, azio_stream *writer); bool check_if_incompatible_data(HA_CREATE_INFO *info, uint table_changes); int external_lock(THD *thd, int lock_type); private: |