diff options
author | unknown <petr@mysql.com> | 2005-02-27 18:41:34 +0300 |
---|---|---|
committer | unknown <petr@mysql.com> | 2005-02-27 18:41:34 +0300 |
commit | dc9059e008c172d53e157b9386d12893dc308dfa (patch) | |
tree | 982685490bba283c69256c4a5183eda88216d20f /server-tools/instance-manager/buffer.cc | |
parent | 4ce6711a14667d4b6cdef18b1424944adce45ad8 (diff) | |
download | mariadb-git-dc9059e008c172d53e157b9386d12893dc308dfa.tar.gz |
post-review fixes + cleanup + some minor fixes
server-tools/instance-manager/buffer.cc:
coding style fixes
server-tools/instance-manager/buffer.h:
wrong constructor initialisation fixed
server-tools/instance-manager/commands.cc:
cleanup
server-tools/instance-manager/guardian.cc:
cleanup + added lock/unlock routines
server-tools/instance-manager/guardian.h:
GUARD_NODE moved to the header
server-tools/instance-manager/instance.cc:
Fix for the linuxthreads/POSIX signal handling problem (see comments in the code)
server-tools/instance-manager/instance.h:
condition variable renamed and commented
server-tools/instance-manager/instance_map.cc:
We need to refresh guardian during flush_instances
server-tools/instance-manager/instance_map.h:
removed obsolete function declaration
server-tools/instance-manager/instance_options.cc:
added caching of computed values
server-tools/instance-manager/instance_options.h:
added vars to cache some option values
server-tools/instance-manager/listener.cc:
check whether we are running on the linux threads
server-tools/instance-manager/manager.cc:
lock guardian before init()
server-tools/instance-manager/parse_output.cc:
cleanup
server-tools/instance-manager/priv.cc:
added global variables to detect whether we are running on the LinuxThreads
server-tools/instance-manager/priv.h:
added global variables to detect whether we are running on the LinuxThreads
Diffstat (limited to 'server-tools/instance-manager/buffer.cc')
-rw-r--r-- | server-tools/instance-manager/buffer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/buffer.cc b/server-tools/instance-manager/buffer.cc index aaed161838d..b000a48d5ae 100644 --- a/server-tools/instance-manager/buffer.cc +++ b/server-tools/instance-manager/buffer.cc @@ -79,13 +79,13 @@ int Buffer::reserve(uint position, uint len_arg) if (position + len_arg >= MAX_BUFFER_SIZE) goto err; - if (position + len_arg>= buffer_size) + if (position + len_arg >= buffer_size) { buffer= (char *) my_realloc(buffer, min(MAX_BUFFER_SIZE, max((uint) (buffer_size*1.5), position + len_arg)), MYF(0)); - if (buffer == NULL) + if (!(buffer)) goto err; buffer_size= (uint) (buffer_size*1.5); } |