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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
5af97358
Commit
5af97358
authored
Mar 25, 2011
by
Georgi Kodinov
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
dcf6b68d
f24b6702
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
69 additions
and
14 deletions
+69
-14
mysql-test/extra/rpl_tests/rpl_record_compare.test
mysql-test/extra/rpl_tests/rpl_record_compare.test
+20
-0
mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result
mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result
+6
-0
mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result
mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result
+13
-7
mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
+4
-2
sql/log_event.cc
sql/log_event.cc
+26
-5
No files found.
mysql-test/extra/rpl_tests/rpl_record_compare.test
View file @
5af97358
...
...
@@ -62,4 +62,24 @@ UPDATE t1 SET c1= 0;
DROP
TABLE
t1
;
--
sync_slave_with_master
#
# BUG#11766865: 60091: RBR + NO PK + UPDATE NULL VALUE --> SLAVE BREAK WITH ERROR HA_ERR_END_OF_
#
--
connection
master
--
source
include
/
rpl_reset
.
inc
--
connection
master
--
eval
CREATE
TABLE
t1
(
c1
int
(
11
)
NOT
NULL
,
c2
int
(
11
)
NOT
NULL
,
c3
int
(
11
)
DEFAULT
'-1'
)
ENGINE
=
$engine
DEFAULT
CHARSET
=
latin1
INSERT
INTO
t1
VALUES
(
1
,
2
,
NULL
);
UPDATE
t1
SET
c1
=
1
,
c2
=
2
,
c3
=-
1
WHERE
c1
=
1
AND
c2
=
2
AND
ISNULL
(
c3
);
--
sync_slave_with_master
--
let
$diff_tables
=
master
:
test
.
t1
,
slave
:
test
.
t1
--
source
include
/
diff_tables
.
inc
--
connection
master
DROP
TABLE
t1
;
--
sync_slave_with_master
mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result
View file @
5af97358
...
...
@@ -25,4 +25,10 @@ INSERT INTO t1(c1) VALUES (NULL);
UPDATE t1 SET c1= 0;
include/diff_tables.inc [master:t1, slave:t1]
DROP TABLE t1;
include/rpl_reset.inc
CREATE TABLE t1 (c1 int(11) NOT NULL, c2 int(11) NOT NULL, c3 int(11) DEFAULT '-1') ENGINE=InnoDB DEFAULT CHARSET=latin1;
INSERT INTO t1 VALUES (1,2,NULL);
UPDATE t1 SET c1=1, c2=2, c3=-1 WHERE c1=1 AND c2=2 AND ISNULL(c3);
include/diff_tables.inc [master:test.t1, slave:test.t1]
DROP TABLE t1;
include/rpl_end.inc
mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result
View file @
5af97358
include/master-slave.inc
[connection master]
## coverage purposes - Field_bits
## 1 X bit + 2 Null bits + 5 bits => last_null_bit_pos==0
include/rpl_reset.inc
CREATE TABLE t1 (c1 bigint(20) DEFAULT 0, c2 bit(5)) ENGINE=MyISAM DEFAULT CHARSET=latin1;
INSERT INTO t1(c1,c2) VALUES (10, b'1');
INSERT INTO t1(c1,c2) VALUES (NULL, b'1');
UPDATE t1 SET c1= 0;
include/diff_tables.inc [master:t1, slave:t1]
DROP TABLE t1;
## case #1 - last_null_bit_pos==0 in record_compare without X bit
include/rpl_reset.inc
CREATE TABLE t1 (c1 bigint(20) DEFAULT 0, c2 bigint(20) DEFAULT 0, c3 bigint(20) DEFAULT 0, c4 varchar(1) DEFAULT '', c5 bigint(20) DEFAULT 0, c6 bigint(20) DEFAULT 0, c7 bigint(20) DEFAULT 0, c8 bigint(20) DEFAULT 0) ENGINE=MyISAM DEFAULT CHARSET=latin1;
...
...
@@ -25,13 +34,10 @@ INSERT INTO t1(c1) VALUES (NULL);
UPDATE t1 SET c1= 0;
include/diff_tables.inc [master:t1, slave:t1]
DROP TABLE t1;
## coverage purposes - Field_bits
## 1 X bit + 2 Null bits + 5 bits => last_null_bit_pos==0
include/rpl_reset.inc
CREATE TABLE t1 (c1 bigint(20) DEFAULT 0, c2 bit(5)) ENGINE=MyISAM DEFAULT CHARSET=latin1;
INSERT INTO t1(c1,c2) VALUES (10, b'1');
INSERT INTO t1(c1,c2) VALUES (NULL, b'1');
UPDATE t1 SET c1= 0;
include/diff_tables.inc [master:t1, slave:t1]
CREATE TABLE t1 (c1 int(11) NOT NULL, c2 int(11) NOT NULL, c3 int(11) DEFAULT '-1') ENGINE=MyISAM DEFAULT CHARSET=latin1;
INSERT INTO t1 VALUES (1,2,NULL);
UPDATE t1 SET c1=1, c2=2, c3=-1 WHERE c1=1 AND c2=2 AND ISNULL(c3);
include/diff_tables.inc [master:test.t1, slave:test.t1]
DROP TABLE t1;
include/rpl_end.inc
mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
View file @
5af97358
--
source
include
/
have_binlog_format_row
.
inc
--
source
include
/
master
-
slave
.
inc
--
let
$engine
=
MyISAM
#
# BUG#52868 Wrong handling of NULL value during update, replication out of sync
#
--
let
$engine
=
MyISAM
--
source
extra
/
rpl_tests
/
rpl_record_compare
.
test
--
echo
## coverage purposes - Field_bits
--
echo
## 1 X bit + 2 Null bits + 5 bits => last_null_bit_pos==0
...
...
@@ -28,4 +27,7 @@ UPDATE t1 SET c1= 0;
--
connection
master
DROP
TABLE
t1
;
--
sync_slave_with_master
--
source
extra
/
rpl_tests
/
rpl_record_compare
.
test
--
source
include
/
rpl_end
.
inc
sql/log_event.cc
View file @
5af97358
...
...
@@ -8888,7 +8888,19 @@ static bool record_compare(TABLE *table)
}
}
if
(
table
->
s
->
blob_fields
+
table
->
s
->
varchar_fields
==
0
)
/**
Compare full record only if:
- there are no blob fields (otherwise we would also need
to compare blobs contents as well);
- there are no varchar fields (otherwise we would also need
to compare varchar contents as well);
- there are no null fields, otherwise NULLed fields
contents (i.e., the don't care bytes) may show arbitrary
values, depending on how each engine handles internally.
*/
if
((
table
->
s
->
blob_fields
+
table
->
s
->
varchar_fields
+
table
->
s
->
null_fields
)
==
0
)
{
result
=
cmp_record
(
table
,
record
[
1
]);
goto
record_compare_exit
;
...
...
@@ -8903,13 +8915,22 @@ static bool record_compare(TABLE *table)
goto
record_compare_exit
;
}
/* Compare
updated
fields */
/* Compare fields */
for
(
Field
**
ptr
=
table
->
field
;
*
ptr
;
ptr
++
)
{
if
((
*
ptr
)
->
cmp_binary_offset
(
table
->
s
->
rec_buff_length
))
/**
We only compare field contents that are not null.
NULL fields (i.e., their null bits) were compared
earlier.
*/
if
(
!
(
*
(
ptr
))
->
is_null
())
{
result
=
TRUE
;
goto
record_compare_exit
;
if
((
*
ptr
)
->
cmp_binary_offset
(
table
->
s
->
rec_buff_length
))
{
result
=
TRUE
;
goto
record_compare_exit
;
}
}
}
...
...
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