mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2004-12-22 09:45:21 +01:00
commit cf03138893
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server-tools/instance-manager/mysql_connection.cc
View file

@ -296,7 +296,6 @@ int Mysql_connection_thread::check_user(const char *user, const char *password)
int Mysql_connection_thread::do_command() int Mysql_connection_thread::do_command()
{ {
char *packet; char *packet;
uint old_timeout;
ulong packet_length; ulong packet_length;
/* We start to count packets from 0 for each new command */ /* We start to count packets from 0 for each new command */

1
server-tools/instance-manager/parse.cc
View file

@ -131,7 +131,6 @@ Command *parse_command(Command_factory *factory, const char *text)
const char *instance_name; const char *instance_name;
uint instance_name_len; uint instance_name_len;
Command *command; Command *command;
const char *saved_text= text;
Token tok1= shift_token(&text, &word_len); Token tok1= shift_token(&text, &word_len);

5
server-tools/instance-manager/thread_registry.cc
View file

@ -148,6 +148,7 @@ int Thread_registry::cond_wait(Thread_info *info, pthread_cond_t *cond,
void Thread_registry::deliver_shutdown() void Thread_registry::deliver_shutdown()
{ {
Thread_info *info;
struct timespec shutdown_time; struct timespec shutdown_time;
set_timespec(shutdown_time, 1); set_timespec(shutdown_time, 1);
@ -161,7 +162,7 @@ void Thread_registry::deliver_shutdown()
stopped alarm processing. stopped alarm processing.
*/ */
process_alarm(THR_SERVER_ALARM); 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); 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 so this time everybody should be informed (presumably each worker can
get CPU during shutdown_time.) 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); pthread_kill(info->thread_id, THREAD_KICK_OFF_SIGNAL);
if (info->current_cond) if (info->current_cond)

1
server-tools/instance-manager/user_map.cc
View file

@ -123,7 +123,6 @@ int User_map::load(const char *password_file_name)
1 + /* for ':' */ 1 + /* for ':' */
1 + /* for newline */ 1 + /* for newline */
1]; /* for trailing zero */ 1]; /* for trailing zero */
uint line_length;
User *user; User *user;
int rc= 1; int rc= 1;