Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a3d1d148
Commit
a3d1d148
authored
Jul 16, 2022
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-29021 mark fields that have explicit values
so that table->update_default_fields() would know what to update
parent
93fb92d3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
6 deletions
+4
-6
mysql-test/suite/rpl/include/rpl_extra_col_slave.test
mysql-test/suite/rpl/include/rpl_extra_col_slave.test
+1
-2
mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
+1
-2
mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
+1
-2
sql/rpl_record.cc
sql/rpl_record.cc
+1
-0
No files found.
mysql-test/suite/rpl/include/rpl_extra_col_slave.test
View file @
a3d1d148
...
...
@@ -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
,
...
...
mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
View file @
a3d1d148
...
...
@@ -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,
...
...
mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
View file @
a3d1d148
...
...
@@ -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,
...
...
sql/rpl_record.cc
View file @
a3d1d148
...
...
@@ -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
)))
{
(
*
field_ptr
)
->
set_has_explicit_value
();
if
((
null_mask
&
0xFF
)
==
0
)
{
DBUG_ASSERT
(
null_ptr
<
row_data
+
master_null_byte_count
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment