diff options
| -rw-r--r-- | server-tools/instance-manager/mysql_connection.cc | 1 | ||||
| -rw-r--r-- | server-tools/instance-manager/parse.cc | 1 | ||||
| -rw-r--r-- | server-tools/instance-manager/thread_registry.cc | 5 | ||||
| -rw-r--r-- | server-tools/instance-manager/user_map.cc | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc index 83b046c1e5b..d3f58bf3771 100644 --- a/server-tools/instance-manager/mysql_connection.cc +++ b/server-tools/instance-manager/mysql_connection.cc @@ -296,7 +296,6 @@ int Mysql_connection_thread::check_user(const char *user, const char *password) int Mysql_connection_thread::do_command() { char *packet; - uint old_timeout; ulong packet_length; /* We start to count packets from 0 for each new command */ diff --git a/server-tools/instance-manager/parse.cc b/server-tools/instance-manager/parse.cc index 38e10c7f2f5..d029267f9b8 100644 --- a/server-tools/instance-manager/parse.cc +++ b/server-tools/instance-manager/parse.cc @@ -131,7 +131,6 @@ Command *parse_command(Command_factory *factory, const char *text) const char *instance_name; uint instance_name_len; Command *command; - const char *saved_text= text; Token tok1= shift_token(&text, &word_len); diff --git a/server-tools/instance-manager/thread_registry.cc b/server-tools/instance-manager/thread_registry.cc index 4037da71880..d0bf51f3d61 100644 --- a/server-tools/instance-manager/thread_registry.cc +++ b/server-tools/instance-manager/thread_registry.cc @@ -148,6 +148,7 @@ int Thread_registry::cond_wait(Thread_info *info, pthread_cond_t *cond, void Thread_registry::deliver_shutdown() { + Thread_info *info; struct timespec shutdown_time; set_timespec(shutdown_time, 1); @@ -161,7 +162,7 @@ void Thread_registry::deliver_shutdown() stopped alarm processing. */ process_alarm(THR_SERVER_ALARM); - for (Thread_info *info= head.next; info != &head; info= info->next) + for (info= head.next; info != &head; info= info->next) { pthread_kill(info->thread_id, THREAD_KICK_OFF_SIGNAL); /* @@ -190,7 +191,7 @@ void Thread_registry::deliver_shutdown() so this time everybody should be informed (presumably each worker can get CPU during shutdown_time.) */ - for (Thread_info *info= head.next; info != &head; info= info->next) + for (info= head.next; info != &head; info= info->next) { pthread_kill(info->thread_id, THREAD_KICK_OFF_SIGNAL); if (info->current_cond) diff --git a/server-tools/instance-manager/user_map.cc b/server-tools/instance-manager/user_map.cc index b921152d858..8cbceceac7c 100644 --- a/server-tools/instance-manager/user_map.cc +++ b/server-tools/instance-manager/user_map.cc @@ -123,7 +123,6 @@ int User_map::load(const char *password_file_name) 1 + /* for ':' */ 1 + /* for newline */ 1]; /* for trailing zero */ - uint line_length; User *user; int rc= 1; |