diff options
| author | unknown <anozdrin/alik@booka.site> | 2006-11-20 15:37:12 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@booka.site> | 2006-11-20 15:37:12 +0300 |
| commit | 4da807726b3f1ea6d495a33178e51c16b52b3dd4 (patch) | |
| tree | 9ee1eab65ab5cc4dd88dc2c8078cb3495906f56a /server-tools/instance-manager/manager.cc | |
| parent | bc06af9d69fcc5b90b81a1d2e9b9d0e0be3b996e (diff) | |
| download | mariadb-git-4da807726b3f1ea6d495a33178e51c16b52b3dd4.tar.gz | |
Polishing + make the code compiled on Windows.
server-tools/instance-manager/listener.cc:
Polishing: declare variable prior to the first statement in block.
server-tools/instance-manager/listener.h:
Polishing.
server-tools/instance-manager/manager.cc:
Make Manager::manager_pid local variable.
server-tools/instance-manager/manager.h:
Make Manager::manager_pid local variable.
server-tools/instance-manager/thread_registry.cc:
Polsihing.
Diffstat (limited to 'server-tools/instance-manager/manager.cc')
| -rw-r--r-- | server-tools/instance-manager/manager.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc index 4fb4efef87e..a55adbed950 100644 --- a/server-tools/instance-manager/manager.cc +++ b/server-tools/instance-manager/manager.cc @@ -114,7 +114,6 @@ Guardian *Manager::p_guardian; Instance_map *Manager::p_instance_map; Thread_registry *Manager::p_thread_registry; User_map *Manager::p_user_map; -pid_t Manager::manager_pid; /* manager - entry point to the main instance manager process: start @@ -131,6 +130,7 @@ int Manager::main() int rc= 1; const char *err_msg; bool shutdown_complete= FALSE; + pid_t manager_pid= getpid(); Thread_registry thread_registry; /* @@ -146,7 +146,6 @@ int Manager::main() Listener listener(&thread_registry, &user_map); - manager_pid= getpid(); p_instance_map= &instance_map; p_guardian= instance_map.guardian= &guardian; p_thread_registry= &thread_registry; |