1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-29021 mark fields that have explicit values

Browse Source 
so that table->update_default_fields() would know what to update
This commit is contained in:
Sergei Golubchik 2022-07-16 19:35:32 +02:00
parent 93fb92d3f9
commit a3d1d1485a
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/rpl/include/rpl_extra_col_slave.test
View File

@ -397,8 +397,7 @@ sync_slave_with_master;
STOP SLAVE; STOP SLAVE;
--source include/reset_slave.inc --source include/reset_slave.inc
eval CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5), eval CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5),
d TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP d TIMESTAMP NOT NULL DEFAULT 0,
ON UPDATE CURRENT_TIMESTAMP,
e INT NOT NULL, e INT NOT NULL,
f text not null, f text not null,
g text, g text,

3
mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
View File

@ -260,8 +260,7 @@ connection slave;
STOP SLAVE; STOP SLAVE;
include/reset_slave.inc include/reset_slave.inc
CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5), CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5),
d TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP d TIMESTAMP NOT NULL DEFAULT 0,
ON UPDATE CURRENT_TIMESTAMP,
e INT NOT NULL, e INT NOT NULL,
f text not null, f text not null,
g text, g text,

3
mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
View File

@ -260,8 +260,7 @@ connection slave;
STOP SLAVE; STOP SLAVE;
include/reset_slave.inc include/reset_slave.inc
CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5), CREATE TABLE t9 (a INT KEY, b BLOB, c CHAR(5),
d TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP d TIMESTAMP NOT NULL DEFAULT 0,
ON UPDATE CURRENT_TIMESTAMP,
e INT NOT NULL, e INT NOT NULL,
f text not null, f text not null,
g text, g text,

1
sql/rpl_record.cc
View File

@ -265,6 +265,7 @@ int unpack_row(rpl_group_info *rgi, TABLE *table, uint const colcnt,
*/ */
if (bitmap_is_set(cols, (uint)(field_ptr - begin_ptr))) if (bitmap_is_set(cols, (uint)(field_ptr - begin_ptr)))
{ {
(*field_ptr)->set_has_explicit_value();
if ((null_mask & 0xFF) == 0) if ((null_mask & 0xFF) == 0)
{ {
DBUG_ASSERT(null_ptr < row_data + master_null_byte_count); DBUG_ASSERT(null_ptr < row_data + master_null_byte_count);