diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-01 13:02:54 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-01 13:02:54 +0100 |
| commit | c06f995ba73834febc971b573a48d7b17dd1a36b (patch) | |
| tree | 90907c9ba079c9a6f4d555883abe4775ee5aa762 /server-tools/instance-manager/guardian.cc | |
| parent | 114197b589dcc5612943fb967082f1c1be9d23a9 (diff) | |
| parent | 25226de9ea52d06667c2c7fbd99f5cd014764241 (diff) | |
| download | mariadb-git-c06f995ba73834febc971b573a48d7b17dd1a36b.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'server-tools/instance-manager/guardian.cc')
| -rw-r--r-- | server-tools/instance-manager/guardian.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index 3587a599160..0a037b5b98a 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -222,8 +222,6 @@ void Guardian_thread::run() while (node != NULL) { - struct timespec timeout; - GUARD_NODE *current_node= (GUARD_NODE *) node->data; instance= ((GUARD_NODE *) node->data)->instance; process_instance(instance, current_node, &guarded_instances, node); |