database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree.

Browse Source
This commit is contained in:
unknown
2011-05-03 14:44:25 +02:00
parent 8ac88c88f0 014b8e7f43
commit 284f52476c
67 changed files with 3034 additions and 1243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/include/binlog_start_pos.inc
View File

@@ -11,16 +11,18 @@
# Format_description_log_event length =
# 19 /* event common header */ +
# 57 /* misc stuff in the Format description header */ +
# number of events.
# number of events +
# 1 /* Checksum algorithm */ +
# 4 /* CRC32 length */
#
# With current number of events = 160,
#
# binlog_start_pos = 4 + 19 + 57 + 160 = 240.
# binlog_start_pos = 4 + 19 + 57 + 160 + 1 + 4 = 245.
#
##############################################################################
let $binlog_start_pos=240;
let $binlog_start_pos=245;
--disable_query_log
SET @binlog_start_pos=240;
SET @binlog_start_pos=245;
--enable_query_log

4
mysql-test/include/have_binlog_checksum_off.inc Normal file
View File

@@ -0,0 +1,4 @@
if (`select variable_value not like 'NONE' from information_schema.GLOBAL_VARIABLES
where variable_name='binlog_checksum'`){
skip Can not run the test when server activated checksumming;
}

3
mysql-test/include/mtr_warnings.sql
View File

@@ -209,6 +209,9 @@ INSERT INTO global_suppressions VALUES
("Slave I/O: Get master clock failed with error:.*"),
("Slave I/O: Get master COLLATION_SERVER failed with error:.*"),
("Slave I/O: Get master TIME_ZONE failed with error:.*"),
("Slave I/O: The slave I/O thread stops because a fatal error is encountered when it tried to SET @master_binlog_checksum on master.*"),
("Slave I/O: Get master BINLOG_CHECKSUM failed with error.*"),
("Slave I/O: Notifying master by SET @master_binlog_checksum= @@global.binlog_checksum failed with error.*"),
("THE_LAST_SUPPRESSION")||

2
mysql-test/include/show_binlog_events2.inc
View File

@@ -1,4 +1,4 @@
--let $binlog_start=240
--let $binlog_start=245
--replace_result $binlog_start <binlog_start>
--replace_column 2 # 5 #
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/