diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-13 11:11:04 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-13 11:11:04 +0200 |
| commit | 88c35781cc9f5f3c63de98a8b6e7eb3378d4fae5 (patch) | |
| tree | 1a2c280180c19e71b87e520546b3d2473af3b1bd /storage/innobase/handler/ha_innodb.cc | |
| parent | 92c8d6f168f329bf7e3998a4f580781d0239b59a (diff) | |
| parent | 1e04cafcba88e1801e828a5bbab7fe9fdd7ca61c (diff) | |
| download | mariadb-git-88c35781cc9f5f3c63de98a8b6e7eb3378d4fae5.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'storage/innobase/handler/ha_innodb.cc')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index ea4e4f6094f..71ee54b7094 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -8580,10 +8580,12 @@ ha_innobase::update_row( const bool vers_ins_row = vers_set_fields && thd_sql_command(m_user_thd) != SQLCOM_ALTER_TABLE; + TABLE_LIST *tl= table->pos_in_table_list; + uint8 op_map= tl->trg_event_map | tl->slave_fk_event_map; /* This is not a delete */ m_prebuilt->upd_node->is_delete = (vers_set_fields && !vers_ins_row) || - (thd_sql_command(m_user_thd) == SQLCOM_DELETE && + (op_map & trg2bit(TRG_EVENT_DELETE) && table->versioned(VERS_TIMESTAMP)) ? VERSIONED_DELETE : NO_DELETE; |