diff options
| author | unknown <pgalbraith@bk-internal.mysql.com> | 2006-12-09 02:34:42 +0100 |
|---|---|---|
| committer | unknown <pgalbraith@bk-internal.mysql.com> | 2006-12-09 02:34:42 +0100 |
| commit | 9e82f299e526ceafd0deb105f0487681406b1be8 (patch) | |
| tree | a683748b700b98b6f378009228727821e369623b /server-tools | |
| parent | b0a5cd8ed133b8bce2ab470826dd8d91ec27fa9d (diff) | |
| parent | e54bbaa3fb8793905d37af808b9bee6a49df358a (diff) | |
| download | mariadb-git-9e82f299e526ceafd0deb105f0487681406b1be8.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
client/mysql.cc:
Auto merged
sql/field_conv.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/guardian.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index e601ce0111c..812e5fad9e0 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/server-tools/instance-manager/guardian.cc @@ -67,6 +67,7 @@ Guardian::Guardian(Thread_registry *thread_registry_arg, monitoring_interval(monitoring_interval_arg), thread_registry(thread_registry_arg), instance_map(instance_map_arg), + guarded_instances(0), shutdown_requested(FALSE) { pthread_mutex_init(&LOCK_guardian, 0); |