From 5bd607785a1f72b826831ab45c99d75b69846531 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 13 Feb 2005 15:13:33 +0300 Subject: various fixes server-tools/instance-manager/buffer.cc: use my_realloc instead of realloc server-tools/instance-manager/buffer.h: use my_malloc instead of malloc server-tools/instance-manager/commands.cc: No need to send a buffer if there were some error while writing to it server-tools/instance-manager/instance_options.cc: cleanup server-tools/instance-manager/manager.cc: check sigwait return value server-tools/instance-manager/parse_output.cc: fixed a bug, found with valgrind --- server-tools/instance-manager/commands.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'server-tools/instance-manager/commands.cc') diff --git a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc index 3f38f21b008..4667e76bfd6 100644 --- a/server-tools/instance-manager/commands.cc +++ b/server-tools/instance-manager/commands.cc @@ -184,8 +184,8 @@ int Show_instance_status::do_command(struct st_net *net, } - if (my_net_write(net, send_buff.buffer, (uint) position) || - send_buff.is_error()) + if (send_buff.is_error() || + my_net_write(net, send_buff.buffer, (uint) position)) goto err; } @@ -271,8 +271,8 @@ int Show_instance_options::do_command(struct st_net *net, store_to_string(&send_buff, (char *) instance->options.mysqld_path, &position); - if (my_net_write(net, send_buff.buffer, (uint) position) || - send_buff.is_error()) + if (send_buff.is_error() || + my_net_write(net, send_buff.buffer, (uint) position)) goto err; } @@ -281,8 +281,8 @@ int Show_instance_options::do_command(struct st_net *net, position= 0; store_to_string(&send_buff, (char *) "nonguarded", &position); store_to_string(&send_buff, "", &position); - if (my_net_write(net, send_buff.buffer, (uint) position) || - send_buff.is_error()) + if (send_buff.is_error() || + my_net_write(net, send_buff.buffer, (uint) position)) goto err; } @@ -299,8 +299,8 @@ int Show_instance_options::do_command(struct st_net *net, store_to_string(&send_buff, option_value + 1, &position); /* join name and the value into the same option again */ *option_value= '='; - if (my_net_write(net, send_buff.buffer, (uint) position) || - send_buff.is_error()) + if (send_buff.is_error() || + my_net_write(net, send_buff.buffer, (uint) position)) goto err; } } -- cgit v1.2.1