mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

handler: move row change start signal down after the checks

Browse source
This commit is contained in:
Nikita Malyavin 2020-10-14 15:40:46 +10:00
parent e618f7e9f6
commit f244b499e7
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sql/handler.cc
View file

@ -7129,16 +7129,17 @@ int handler::ha_write_row(const uchar *buf)
if ((error= ha_check_overlaps(NULL, buf))) if ((error= ha_check_overlaps(NULL, buf)))
DBUG_RETURN(error); DBUG_RETURN(error);
MYSQL_INSERT_ROW_START(table_share->db.str, table_share->table_name.str);
mark_trx_read_write();
increment_statistics(&SSV::ha_write_count);
if (table->s->long_unique_table && this == table->file) if (table->s->long_unique_table && this == table->file)
{ {
DBUG_ASSERT(inited == NONE || lookup_handler != this); DBUG_ASSERT(inited == NONE || lookup_handler != this);
if ((error= check_duplicate_long_entries(buf))) if ((error= check_duplicate_long_entries(buf)))
DBUG_RETURN(error); DBUG_RETURN(error);
} }
MYSQL_INSERT_ROW_START(table_share->db.str, table_share->table_name.str);
mark_trx_read_write();
increment_statistics(&SSV::ha_write_count);
TABLE_IO_WAIT(tracker, PSI_TABLE_WRITE_ROW, MAX_KEY, error, TABLE_IO_WAIT(tracker, PSI_TABLE_WRITE_ROW, MAX_KEY, error,
{ error= write_row(buf); }) { error= write_row(buf); })
@ -7181,10 +7182,6 @@ int handler::ha_update_row(const uchar *old_data, const uchar *new_data)
uint saved_status= table->status; uint saved_status= table->status;
error= ha_check_overlaps(old_data, new_data); error= ha_check_overlaps(old_data, new_data);
MYSQL_UPDATE_ROW_START(table_share->db.str, table_share->table_name.str);
mark_trx_read_write();
increment_statistics(&SSV::ha_update_count);
if (!error && table->s->long_unique_table && this == table->file) if (!error && table->s->long_unique_table && this == table->file)
error= check_duplicate_long_entries_update(new_data); error= check_duplicate_long_entries_update(new_data);
table->status= saved_status; table->status= saved_status;
@ -7192,6 +7189,9 @@ int handler::ha_update_row(const uchar *old_data, const uchar *new_data)
if (error) if (error)
return error; return error;
MYSQL_UPDATE_ROW_START(table_share->db.str, table_share->table_name.str);
mark_trx_read_write();
increment_statistics(&SSV::ha_update_count);
TABLE_IO_WAIT(tracker, PSI_TABLE_UPDATE_ROW, active_index, 0, TABLE_IO_WAIT(tracker, PSI_TABLE_UPDATE_ROW, active_index, 0,
{ error= update_row(old_data, new_data);}) { error= update_row(old_data, new_data);})