summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2017-04-16 22:40:39 +0300
committerMonty <monty@mariadb.org>2017-04-18 12:23:53 +0300
commita05a610d60a6d177b66f9da97906efdb44336a6f (patch)
treebca0d63ddc2a8b43d22a3d1732e5497caab40f78 /sql/handler.cc
parentd82ac8eaafd89a6a74436747b660ef02c69eaac3 (diff)
downloadmariadb-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 'sql/handler.cc')
-rw-r--r--sql/handler.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 5d0ec99e978..fb4384a8bc5 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -4042,7 +4042,7 @@ int handler::ha_repair(THD* thd, HA_CHECK_OPT* check_opt)
*/
int
-handler::ha_bulk_update_row(const uchar *old_data, uchar *new_data,
+handler::ha_bulk_update_row(const uchar *old_data, const uchar *new_data,
uint *dup_key_found)
{
DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
@@ -5998,7 +5998,7 @@ int handler::ha_write_row(uchar *buf)
}
-int handler::ha_update_row(const uchar *old_data, uchar *new_data)
+int handler::ha_update_row(const uchar *old_data, const uchar *new_data)
{
int error;
Log_func *log_func= Update_rows_log_event::binlog_row_logging_function;