database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.11 into 11.0

Browse Source
This commit is contained in:
Marko Mäkelä
2023-04-27 15:11:18 +03:00
parent 54819192fe 7b17e0d4ac
commit aa6ba99310
31 changed files with 646 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/log_event_server.cc
View File

@@ -6986,7 +6986,7 @@ uint8 Write_rows_log_event::get_trg_event_map()
Returns TRUE if different.
*/
static bool record_compare(TABLE *table)
static bool record_compare(TABLE *table, bool vers_from_plain= false)
{
bool result= FALSE;
/**
@@ -7019,10 +7019,19 @@ static bool record_compare(TABLE *table)
/* Compare fields */
for (Field **ptr=table->field ; *ptr ; ptr++)
{
if (table->versioned() && (*ptr)->vers_sys_field())
{
/*
If the table is versioned, don't compare using the version if there is a
primary key. If there isn't a primary key, we need the version to
identify the correct record if there are duplicate rows in the data set.
However, if the primary server is unversioned (vers_from_plain is true),
then we implicitly use row_end as the primary key on our side. This is
because the implicit row_end value will be set to the maximum value for
the latest row update (which is what we care about).
*/
if (table->versioned() && (*ptr)->vers_sys_field() &&
(table->s->primary_key < MAX_KEY ||
(vers_from_plain && table->vers_start_field() == (*ptr))))
continue;
}
/**
We only compare field contents that are not null.
NULL fields (i.e., their null bits) were compared
@@ -7416,7 +7425,7 @@ int Rows_log_event::find_row(rpl_group_info *rgi)
/* We use this to test that the correct key is used in test cases. */
DBUG_EXECUTE_IF("slave_crash_if_index_scan", abort(););
while (record_compare(table))
while (record_compare(table, m_vers_from_plain))
{
while ((error= table->file->ha_index_next(table->record[0])))
{
@@ -7469,7 +7478,7 @@ int Rows_log_event::find_row(rpl_group_info *rgi)
goto end;
}
}
while (record_compare(table));
while (record_compare(table, m_vers_from_plain));
/*
Note: above record_compare will take into accout all record fields