diff options
| author | unknown <monty@mysql.com> | 2005-10-12 00:59:52 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-10-12 00:59:52 +0300 |
| commit | 706157f025c8bfe01faa3783a54eecb8884b0d3f (patch) | |
| tree | 7613691c50c9b918d5dbcb5683e2672e06db2a71 /server-tools/instance-manager/instance.cc | |
| parent | 4857e205a3fbe7d533af70028adf7ee8868a174e (diff) | |
| parent | 0ce12f70ed2eee1b92e2af27e7dda30db544f492 (diff) | |
| download | mariadb-git-706157f025c8bfe01faa3783a54eecb8884b0d3f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
server-tools/instance-manager/instance.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_manager.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
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; } |