diff options
| author | unknown <petr@mysql.com> | 2005-02-13 15:13:33 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-02-13 15:13:33 +0300 |
| commit | 5bd607785a1f72b826831ab45c99d75b69846531 (patch) | |
| tree | 0416b3a77d516d448dfd5239dadc5bf9e7583bcc /server-tools/instance-manager/buffer.h | |
| parent | dce2554f9130920ab18e4e31432df7d6ca165ee0 (diff) | |
| download | mariadb-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.h')
| -rw-r--r-- | server-tools/instance-manager/buffer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server-tools/instance-manager/buffer.h b/server-tools/instance-manager/buffer.h index 260a9ef92f8..85dd210cac2 100644 --- a/server-tools/instance-manager/buffer.h +++ b/server-tools/instance-manager/buffer.h @@ -17,6 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <my_global.h> +#include <my_sys.h> #ifdef __GNUC__ #pragma interface @@ -45,7 +46,7 @@ public: /* As append() will invokes realloc() anyway, it's ok if malloc returns 0 */ - if (!(buffer= (char*) malloc(buffer_size))) + if (!(buffer= (char*) my_malloc(buffer_size, MYF(0)))) buffer_size= 0; } |