diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-07-16 19:35:32 +0200 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2022-08-23 16:36:27 +0300 |
| commit | d94b14f5ea0ddcc36e7a5f87b77a32891373500e (patch) | |
| tree | b2cd3063d2f4b448d11e2817c58440090d0719f2 | |
| parent | 462e736877827a2c4a2338727da02b0fcfcf0477 (diff) | |
| download | mariadb-git-d94b14f5ea0ddcc36e7a5f87b77a32891373500e.tar.gz | |
MDEV-29021 fixup
mark fields that have explicit values,
so that table->update_default_fields() would know what to update
| -rw-r--r-- | mysql-test/suite/rpl/include/rpl_extra_col_slave.test | 3 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result | 3 | ||||
| -rw-r--r-- | sql/rpl_record.cc | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/mysql-test/suite/rpl/include/rpl_extra_col_slave.test b/mysql-test/suite/rpl/include/rpl_extra_col_slave.test index 680d5724bea..028c833a6e5 100644 --- a/mysql-test/suite/rpl/include/rpl_extra_col_slave.test +++ b/mysql-test/suite/rpl/include/rpl_extra_col_slave.test @@ -397,8 +397,7 @@ sync_slave_with_master; STOP SLAVE; --source include/reset_slave.inc eval CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5), - d TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP - ON UPDATE CURRENT_TIMESTAMP, + d TIMESTAMP NOT NULL DEFAULT 0, e INT NOT NULL, f text not null, g text, diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result index e006d99f47c..6afb31b81ff 100644 --- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result @@ -260,8 +260,7 @@ connection slave; STOP SLAVE; include/reset_slave.inc CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5), -d TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP -ON UPDATE CURRENT_TIMESTAMP, +d TIMESTAMP NOT NULL DEFAULT 0, e INT NOT NULL, f text not null, g text, diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result index ad1874056d6..2e3ba4c3b58 100644 --- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result +++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result @@ -260,8 +260,7 @@ connection slave; STOP SLAVE; include/reset_slave.inc CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5), -d TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP -ON UPDATE CURRENT_TIMESTAMP, +d TIMESTAMP NOT NULL DEFAULT 0, e INT NOT NULL, f text not null, g text, diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc index 1d526bb39c2..101a4f36f9e 100644 --- a/sql/rpl_record.cc +++ b/sql/rpl_record.cc @@ -266,6 +266,7 @@ int unpack_row(rpl_group_info *rgi, TABLE *table, uint const colcnt, */ if (bitmap_is_set(cols, (uint)(field_ptr - begin_ptr))) { + (*field_ptr)->set_has_explicit_value(); if ((null_mask & 0xFF) == 0) { DBUG_ASSERT(null_ptr < row_data + master_null_byte_count); |