Test rpl.rpl_bug33931 is unstable

[Laurynas Biveinis]

On 5.5 trunk:

rpl.rpl_bug33931 'mix' w4 [ fail ]
        Test ended at 2017-04-04 14:08:42

CURRENT_TEST: rpl.rpl_bug33931
mysqltest: At line 45: query 'RESET SLAVE' failed: 1198: This operation cannot be performed with a running slave; run STOP SLAVE first

The result from queries just before the failure was:
include/master-slave.inc
[connection master]
call mtr.add_suppression("Failed during slave I/O thread initialization");
call mtr.add_suppression("Slave SQL.*Failed during slave thread initialization.* 1593");
include/stop_slave.inc
reset slave;
SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
start slave;
include/wait_for_slave_sql_error.inc [errno=1593]
Last_SQL_Error = 'Failed during slave thread initialization'
SET GLOBAL debug="";
safe_process[8818]: Child process: 8821, exit: 1

The fix would be backporting the following commit from 5.6 (with convert_error removed):

commit 581c5a76baed872e1a139aa101847b2d7c407d4f
Author: Joao Gramacho <email address hidden>
Date: Wed Feb 10 14:16:44 2016 +0000

    Bug#21616632 RPL.RPL_BUG33931 HAS OCCASIONAL FAILURES ON PB2

    Problem and Analysis:

    The test case is failing because it forces the two replication threads to
    error out once asked to start, but it is only waiting for the SQL thread to
    stop reporting the error before trying to apply an "RESET SLAVE" statement.

    When a not so fast server didn't stopped the I/O thread before the
    "RESET SLAVE" statement be applied, the test case fails as reported.

    Fix:

    In order to fix the issue, the test case must also wait for the I/O thread to
    be stopped before trying to reset the slave.

[Laurynas Biveinis (laurynas-biveinis)]

     https://github.com/percona/percona-server/pull/1628
     https://github.com/percona/percona-server/pull/1629
     https://github.com/percona/percona-server/pull/1630

[Shahriyar Rzayev (rzayev-sehriyar)]

Percona now uses JIRA for bug reports so this bug report is migrated to: https://jira.percona.com/browse/PS-3680