diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-06-24 14:43:08 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-06-24 14:43:08 +0200 |
| commit | 312219cc63fd49734b3369cc41cdc0f5cf2aaa7f (patch) | |
| tree | 907dfdf08ea24e93abb755227638a18aa428baab /sql/rpl_rli.h | |
| parent | e0c8d729a27ae3a8a1a6c5e6e64f0380381f53d5 (diff) | |
| download | mariadb-git-312219cc63fd49734b3369cc41cdc0f5cf2aaa7f.tar.gz | |
MDEV-6364: Migrate a slave from MySQL 5.6 to MariaDB 10 break replication
MySQL 5.6 implemented WL#344, which is about a MASTER_DELAY option to CHANGE
MASTER. But as part of this worklog, the format of the realy-log.info file was
changed. The new format is not understood by earlier versions, and nor by
MariaDB 10.0, so changing server to those versions would cause the slave to
abort with an error due to reading incorrect data out of relay-log.info.
Fix this by backporting from the WL#344 patch just the code that understands
the new relay-log.info format. We still write out the old format, and none of
the MASTER_DELAY feature is backported with this commit.
Diffstat (limited to 'sql/rpl_rli.h')
| -rw-r--r-- | sql/rpl_rli.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 137571ab820..63791a6389c 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -28,6 +28,12 @@ struct RPL_TABLE_LIST; class Master_info; class Rpl_filter; + +enum { + LINES_IN_RELAY_LOG_INFO_WITH_DELAY= 5 +}; + + /**************************************************************************** Replication SQL Thread |