diff options
| author | Monty <monty@mariadb.org> | 2016-08-22 10:16:00 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-08-22 10:16:00 +0300 |
| commit | b51109693e6abb0e58256192a648cdd158d47615 (patch) | |
| tree | bf6e2bb8e171c21f7f78adc056a009c6164e3fe4 /mysql-test/mysql-test-run.pl | |
| parent | 5932fa789043fad1602a5ebb335adf4e7c860cdf (diff) | |
| download | mariadb-git-b51109693e6abb0e58256192a648cdd158d47615.tar.gz | |
MDEV-10630 rpl.rpl_mdev6020 fails in buildbot with timeout
The issue was that when running with valgrind the wait for master_pos_Wait()
was not long enough.
This patch also fixes two other failures that could affect rpl_mdev6020:
- check_if_conflicting_replication_locks() didn't properly check domains
- 'did_mark_start_commit' was after signals to other threads was sent which could
get the variable read too early.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 07bf941de05..f3b733a1eac 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5899,7 +5899,7 @@ sub start_mysqltest ($) { { # We are running server under valgrind, which causes some replication # test to be much slower, notable rpl_mdev6020. Increase timeout. - mtr_add_arg($args, "--wait-for-pos-timeout=1500"); + mtr_add_arg($args, "--wait-for-pos-timeout=0"); } if ( $opt_ssl ) |