diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-04-16 13:08:29 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-04-16 13:08:29 +0300 |
| commit | fa18dc394406ad684ab2623e7451c9f3ec7adf08 (patch) | |
| tree | 6b708eaa3b970ee14451c2ffdd5d89c7d8dce0dd /sql/wsrep_sst.cc | |
| parent | 150e88e8c9b85e3e6ce500a91fd215d231e99881 (diff) | |
| download | mariadb-git-fa18dc394406ad684ab2623e7451c9f3ec7adf08.tar.gz | |
Merge lp:codership-mysql/5.5 -r3961..3980.
Diffstat (limited to 'sql/wsrep_sst.cc')
| -rw-r--r-- | sql/wsrep_sst.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index ec636a8b1ec..37c55707b28 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -934,8 +934,9 @@ wait_signal: else { WSREP_ERROR("Failed to read from: %s", proc.cmd()); + proc.wait(); } - if (err && proc.error()) err= proc.error(); + if (!err && proc.error()) err= proc.error(); } else { |