diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-07-19 15:28:13 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-07-19 15:28:13 +0530 |
| commit | 4d3a88423897dd05a16a1544f5bb989b95786753 (patch) | |
| tree | bba966d1a64bd467aad6c666f4bbd78460e57436 | |
| parent | 2f07709aed863ea1852a78a0d6ab718e49df8cca (diff) | |
| download | mariadb-git-bb-sachin-13065.tar.gz | |
MDEV-13065 rpl.rpl_mdev-11092 fails sporadically in buildbotbb-sachin-13065
Problem
rpl.rpl_mdev-11092 fails in buildbot because after starting slave in
wait_for_slave_sql_error_and_skip.inc slave is started but there may be
chances that we have not skipped the last error and Last_SQL_Errno is
still not zero untill the end of rpl_end.inc , which will compare
Last_SQL_Errno to 0. So in this this case rpl_mdev-11092 fails.
Solution
After starting slave in wait_for_slave_sql_error_and_skip.inc we will wait for
Last_SQL_Errno to become 0.
| -rw-r--r-- | mysql-test/include/wait_for_slave_sql_error_and_skip.inc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc index 9246c1839af..d68faaf04e7 100644 --- a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc +++ b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc @@ -66,6 +66,13 @@ if (!$slave_skip_counter) { } source include/start_slave.inc; +# start_slave.inc returns when Slave_SQL_Running=Yes. But the slave +# thread sets it before clearing Last_SQL_Errno. So we have to wait +# for Last_SQL_Errno=0 separately. + +let $slave_param= Last_SQL_Errno; +let $slave_param_value= 0; +source include/wait_for_slave_param.inc; --let $include_filename= wait_for_slave_sql_error_and_skip.inc [errno=$slave_sql_errno] --source include/end_include_file.inc |