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/mroonga/ha_mroonga.cpp | |
| parent | d4d865fcc8083782b6e4419c69bec372cd0b4142 (diff) | |
| parent | e9c1701e11e2441435223cc7c00c467f58aaff19 (diff) | |
| download | mariadb-git-624dd71b9419555eca8baadc695e3376de72286f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/mroonga/ha_mroonga.cpp')
| -rw-r--r-- | storage/mroonga/ha_mroonga.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp index 810762e53a0..085ccf55b09 100644 --- a/storage/mroonga/ha_mroonga.cpp +++ b/storage/mroonga/ha_mroonga.cpp @@ -5828,7 +5828,7 @@ bool ha_mroonga::wrapper_have_target_index() DBUG_RETURN(have_target_index); } -int ha_mroonga::wrapper_write_row(uchar *buf) +int ha_mroonga::wrapper_write_row(const uchar *buf) { int error = 0; THD *thd = ha_thd(); @@ -5857,7 +5857,7 @@ int ha_mroonga::wrapper_write_row(uchar *buf) DBUG_RETURN(error); } -int ha_mroonga::wrapper_write_row_index(uchar *buf) +int ha_mroonga::wrapper_write_row_index(const uchar *buf) { MRN_DBUG_ENTER_METHOD(); @@ -5944,7 +5944,7 @@ err: DBUG_RETURN(error); } -int ha_mroonga::storage_write_row(uchar *buf) +int ha_mroonga::storage_write_row(const uchar *buf) { MRN_DBUG_ENTER_METHOD(); int error = 0; @@ -6207,7 +6207,7 @@ err: DBUG_RETURN(error); } -int ha_mroonga::storage_write_row_multiple_column_index(uchar *buf, +int ha_mroonga::storage_write_row_multiple_column_index(const uchar *buf, grn_id record_id, KEY *key_info, grn_obj *index_column) @@ -6244,7 +6244,7 @@ int ha_mroonga::storage_write_row_multiple_column_index(uchar *buf, DBUG_RETURN(error); } -int ha_mroonga::storage_write_row_multiple_column_indexes(uchar *buf, +int ha_mroonga::storage_write_row_multiple_column_indexes(const uchar *buf, grn_id record_id) { MRN_DBUG_ENTER_METHOD(); @@ -6356,7 +6356,7 @@ int ha_mroonga::storage_write_row_unique_index(const uchar *buf, DBUG_RETURN(0); } -int ha_mroonga::storage_write_row_unique_indexes(uchar *buf) +int ha_mroonga::storage_write_row_unique_indexes(const uchar *buf) { int error = 0; uint i; @@ -6419,7 +6419,7 @@ err: DBUG_RETURN(error); } -int ha_mroonga::write_row(uchar *buf) +int ha_mroonga::write_row(const uchar *buf) { MRN_DBUG_ENTER_METHOD(); int error = 0; |