summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/buffer.cc
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2005-02-13 15:13:33 +0300
committerunknown <petr@mysql.com>2005-02-13 15:13:33 +0300
commit5bd607785a1f72b826831ab45c99d75b69846531 (patch)
tree0416b3a77d516d448dfd5239dadc5bf9e7583bcc /server-tools/instance-manager/buffer.cc
parentdce2554f9130920ab18e4e31432df7d6ca165ee0 (diff)
downloadmariadb-git-5bd607785a1f72b826831ab45c99d75b69846531.tar.gz
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
Diffstat (limited to 'server-tools/instance-manager/buffer.cc')
-rw-r--r--server-tools/instance-manager/buffer.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/server-tools/instance-manager/buffer.cc b/server-tools/instance-manager/buffer.cc
index 3a2a818e478..aaed161838d 100644
--- a/server-tools/instance-manager/buffer.cc
+++ b/server-tools/instance-manager/buffer.cc
@@ -81,10 +81,10 @@ int Buffer::reserve(uint position, uint len_arg)
if (position + len_arg>= buffer_size)
{
- buffer= (char *) realloc(buffer,
- min(MAX_BUFFER_SIZE,
- max((uint) (buffer_size*1.5),
- position + len_arg)));
+ buffer= (char *) my_realloc(buffer,
+ min(MAX_BUFFER_SIZE,
+ max((uint) (buffer_size*1.5),
+ position + len_arg)), MYF(0));
if (buffer == NULL)
goto err;
buffer_size= (uint) (buffer_size*1.5);