diff options
author | Michael Widenius <monty@mariadb.org> | 2017-04-16 22:40:39 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2017-04-18 12:23:53 +0300 |
commit | a05a610d60a6d177b66f9da97906efdb44336a6f (patch) | |
tree | bca0d63ddc2a8b43d22a3d1732e5497caab40f78 /storage/federatedx | |
parent | d82ac8eaafd89a6a74436747b660ef02c69eaac3 (diff) | |
download | mariadb-git-a05a610d60a6d177b66f9da97906efdb44336a6f.tar.gz |
Added "const" to new data for handler::update_row()
This was done to make it clear that a update_row() should not change the
row.
This was not done for handler::write_row() as this function still needs
to update auto_increment values in the row. This should at some point
be moved to handler::ha_write_row() after which write_row can also have
const arguments.
Diffstat (limited to 'storage/federatedx')
-rw-r--r-- | storage/federatedx/ha_federatedx.cc | 2 | ||||
-rw-r--r-- | storage/federatedx/ha_federatedx.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index e3506e1a4df..a7b1edd0086 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -2276,7 +2276,7 @@ int ha_federatedx::repair(THD* thd, HA_CHECK_OPT* check_opt) Called from sql_select.cc, sql_acl.cc, sql_update.cc, and sql_insert.cc. */ -int ha_federatedx::update_row(const uchar *old_data, uchar *new_data) +int ha_federatedx::update_row(const uchar *old_data, const uchar *new_data) { /* This used to control how the query was built. If there was a diff --git a/storage/federatedx/ha_federatedx.h b/storage/federatedx/ha_federatedx.h index 2c2c6eef26b..759ddfdfe71 100644 --- a/storage/federatedx/ha_federatedx.h +++ b/storage/federatedx/ha_federatedx.h @@ -394,7 +394,7 @@ public: void start_bulk_insert(ha_rows rows, uint flags); int end_bulk_insert(); int write_row(uchar *buf); - int update_row(const uchar *old_data, uchar *new_data); + int update_row(const uchar *old_data, const uchar *new_data); int delete_row(const uchar *buf); int index_init(uint keynr, bool sorted); ha_rows estimate_rows_upper_bound(); |