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/heap | |
| parent | d4d865fcc8083782b6e4419c69bec372cd0b4142 (diff) | |
| parent | e9c1701e11e2441435223cc7c00c467f58aaff19 (diff) | |
| download | mariadb-git-624dd71b9419555eca8baadc695e3376de72286f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/ha_heap.cc | 2 | ||||
| -rw-r--r-- | storage/heap/ha_heap.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index 846c9322090..b03c9dfd002 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -227,7 +227,7 @@ void ha_heap::update_key_stats() } -int ha_heap::write_row(uchar * buf) +int ha_heap::write_row(const uchar * buf) { int res; if (table->next_number_field && buf == table->record[0]) diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h index 0d2a7a3a442..3440c8fd205 100644 --- a/storage/heap/ha_heap.h +++ b/storage/heap/ha_heap.h @@ -70,7 +70,7 @@ public: int open(const char *name, int mode, uint test_if_locked); int close(void); void set_keys_for_scanning(void); - int write_row(uchar * buf); + int write_row(const uchar * buf); int update_row(const uchar * old_data, const uchar * new_data); int delete_row(const uchar * buf); virtual void get_auto_increment(ulonglong offset, ulonglong increment, |