diff options
| author | monty@mysql.com <> | 2005-10-12 00:59:52 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-10-12 00:59:52 +0300 |
| commit | 5513ab69b76add2457b5288849484460fae78504 (patch) | |
| tree | 7613691c50c9b918d5dbcb5683e2672e06db2a71 /server-tools/instance-manager/instance.cc | |
| parent | 38a470794de2b5361fcc6166a1bdd8f5aa1cfd7f (diff) | |
| parent | f5fdf3e87a5f60fdb6442912ae5741a24b2461c8 (diff) | |
| download | mariadb-git-5513ab69b76add2457b5288849484460fae78504.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'server-tools/instance-manager/instance.cc')
| -rw-r--r-- | server-tools/instance-manager/instance.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index ff3387334b6..945f8abe3c2 100644 --- a/server-tools/instance-manager/instance.cc +++ b/server-tools/instance-manager/instance.cc @@ -469,7 +469,7 @@ int Instance::stop() status= pthread_cond_timedwait(&COND_instance_stopped, &LOCK_instance, &timeout); - if (status == ETIMEDOUT) + if (status == ETIMEDOUT || status == ETIME) break; } |