Created by Vlad Lesin and last modified
Get this branch:
bzr branch lp:~vlad-lesin/percona-server/5.6-bug-1268729
Only Vlad Lesin can upload to this branch. If you are Vlad Lesin please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

536. By Vlad Lesin

Bug #1268735 fixing is merged from 5.5.

The difference between 5.5 and this patches is the following:

      if (is_network_error(mysql_errno(mysql)))
        mi->report(WARNING_LEVEL, mysql_errno(mysql),
                   "SET @master_heartbeat_period to master failed with error: %s",
        goto network_err;
- else if (!check_io_slave_killed(mi->io_thd, mi, NULL)) {
+ else {
        errmsg= "The slave I/O thread stops because SET @master_heartbeat_period "
          "on master failed.";
        err_code= ER_SLAVE_FATAL_ERROR;
        sprintf(err_buff, "%s Error: %s", errmsg, mysql_error(mysql));
        goto err;

The initial code checked if the slave thread was killed in the case if there
was error in mysql_real_query(). To save this logic non-network error in
mysql_real_query() is treated as fatal error only if the slave thread was
not killed in 5.5. But as 5.6 upstream fix (see upstream revno: 2661.723.1)
does not contain this check it was decided do not include it in PS-5.6.

535. By Vlad Lesin

The fix for bug #1268735 merged from 5.5:
Slave I/O thread won't attempt to automatically reconnect to the master.

The fix is in including ER_NET_READ_INTERRUPTED error code to the set of
network related error codes in is_network_error() function.

The test case tests a couple of cases when get_master_version_and_clock()
fails due to ER_NET_READ_INTERRUPTED network error.

There are no big differences between 5.6 and 5.5 fixes.

531. By Laurynas Biveinis

Manually merge lp:~stewart/percona-server/pkg-5.6

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.