diff options
author | unknown <petr@mysql.com> | 2005-05-16 01:54:02 +0400 |
---|---|---|
committer | unknown <petr@mysql.com> | 2005-05-16 01:54:02 +0400 |
commit | 6b4dbcb4db8236d5226284ff87af9126aa83f5b6 (patch) | |
tree | c34a10d30055a4de902dd7001ead6591c91a909c /server-tools/instance-manager/buffer.cc | |
parent | 1ad379af8d404cc257c2ce831e4b5dec80f1c78c (diff) | |
download | mariadb-git-6b4dbcb4db8236d5226284ff87af9126aa83f5b6.tar.gz |
post-review fixes
include/my_sys.h:
added prototype for the defaults correction function
libmysql/Makefile.shared:
my_chsize added to libmysql to let my_correct_defaults_file be used from libmysql
mysys/default.c:
New defaults function added we use it to correct defaults file. Currently the function doesn't lock defaults
file. This is because of the linking and backwards-compatibility issues. This needs to be fixed later.
mysys/my_chsize.c:
comment added
server-tools/instance-manager/buffer.cc:
cleanup
server-tools/instance-manager/commands.cc:
refactoring: removed do_command method from most of the classes
server-tools/instance-manager/commands.h:
cleanup
server-tools/instance-manager/guardian.cc:
cleanup
server-tools/instance-manager/instance.cc:
cleanup
server-tools/instance-manager/instance_map.cc:
cleanup
server-tools/instance-manager/instance_options.cc:
cleanup
server-tools/instance-manager/instance_options.h:
cleanup
server-tools/instance-manager/listener.cc:
cleanup
server-tools/instance-manager/log.cc:
cleanup
server-tools/instance-manager/manager.cc:
cleanup
server-tools/instance-manager/messages.cc:
new errors added
server-tools/instance-manager/mysql_connection.cc:
cleanup
server-tools/instance-manager/mysql_manager_error.h:
new error codes added
server-tools/instance-manager/mysqlmanager.cc:
clenup
server-tools/instance-manager/options.cc:
cleanup
server-tools/instance-manager/parse.cc:
removed unused function
server-tools/instance-manager/parse.h:
removed prototype
server-tools/instance-manager/protocol.cc:
cleanup
server-tools/instance-manager/protocol.h:
added enum to be used in protocol.cc instead of the constants
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 b000a48d5ae..26df401c3c5 100644 --- a/server-tools/instance-manager/buffer.cc +++ b/server-tools/instance-manager/buffer.cc @@ -64,7 +64,7 @@ int Buffer::append(uint position, const char *string, uint len_arg) DESCRIPTION - The method checks whether it is possible to pus a string of teh "len_arg" + The method checks whether it is possible to put a string of the "len_arg" length into the buffer, starting from "position" byte. In the case when the buffer is too small it reallocs the buffer. The total size of the buffer is restricted with 16 Mb. @@ -81,7 +81,7 @@ int Buffer::reserve(uint position, uint len_arg) if (position + len_arg >= buffer_size) { - buffer= (char *) my_realloc(buffer, + buffer= (char*) my_realloc(buffer, min(MAX_BUFFER_SIZE, max((uint) (buffer_size*1.5), position + len_arg)), MYF(0)); |