diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-05-03 14:01:11 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-05-03 14:01:11 +0200 |
| commit | 014b8e7f435e495151fe0ef2cfd5e93d1a398ce5 (patch) | |
| tree | b432f6305fe79b126a19fa03124d28a7a2f05cbe /mysql-test/include | |
| parent | d02d52629d2eda10a50079001a79d50bf3d528cd (diff) | |
| download | mariadb-git-014b8e7f435e495151fe0ef2cfd5e93d1a398ce5.tar.gz | |
Backport MySQL WL#2540 into MariaDB.
Patch backported:
bzr diff
'-rrevid:alfranio.correia@oracle.com-20101121143257-se3vpqus73l4mum0
..revid:luis.soares@oracle.com-20101124111752-9b8260bd1qak87hr'
--old=lp:mysql-server --new=lp:mysql-server
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/binlog_start_pos.inc | 10 | ||||
| -rw-r--r-- | mysql-test/include/have_binlog_checksum_off.inc | 4 | ||||
| -rw-r--r-- | mysql-test/include/mtr_warnings.sql | 3 | ||||
| -rw-r--r-- | mysql-test/include/show_binlog_events2.inc | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/mysql-test/include/binlog_start_pos.inc b/mysql-test/include/binlog_start_pos.inc index f6d1c4c68a3..add5a42a426 100644 --- a/mysql-test/include/binlog_start_pos.inc +++ b/mysql-test/include/binlog_start_pos.inc @@ -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 diff --git a/mysql-test/include/have_binlog_checksum_off.inc b/mysql-test/include/have_binlog_checksum_off.inc new file mode 100644 index 00000000000..c7c444c8785 --- /dev/null +++ b/mysql-test/include/have_binlog_checksum_off.inc @@ -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; +} diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 39ba623f247..caa07b6d5ae 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -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")|| diff --git a/mysql-test/include/show_binlog_events2.inc b/mysql-test/include/show_binlog_events2.inc index 96e42e93f90..c32d12537fd 100644 --- a/mysql-test/include/show_binlog_events2.inc +++ b/mysql-test/include/show_binlog_events2.inc @@ -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: #/ |