diff options
author | unknown <petr@mysql.com> | 2004-10-26 23:22:12 +0400 |
---|---|---|
committer | unknown <petr@mysql.com> | 2004-10-26 23:22:12 +0400 |
commit | 234ca309b9e1e49b6425fbf0dfd662e7d0f7b383 (patch) | |
tree | 84047e5c9807f54931f2d0793890253e8b140755 /server-tools/instance-manager/protocol.cc | |
parent | a3d9a1eb066d7cca01bef104d065864f2a7c65ec (diff) | |
download | mariadb-git-234ca309b9e1e49b6425fbf0dfd662e7d0f7b383.tar.gz |
Various post-review fixes
server-tools/instance-manager/buffer.cc:
simplified buffer interface
server-tools/instance-manager/buffer.h:
simplified buffer interface
server-tools/instance-manager/command.cc:
Command class now uses instance_map directly
server-tools/instance-manager/command.h:
Made Command to use instance_map directly (not through the factory,
which is not needed here in fact)
server-tools/instance-manager/commands.cc:
Moved mysql client/server protocol-specific functions to the commands
server-tools/instance-manager/commands.h:
Added a comment for Syntax_error command, fixed classes to use instance
map instead of the factory
server-tools/instance-manager/factory.cc:
Fixed factory to give appropriate class to the commands
server-tools/instance-manager/guardian.cc:
Fixed guardian to delay start of new instances monitoring.
Moved guardian initialization to the class from Instance map.
server-tools/instance-manager/guardian.h:
interface fixed
server-tools/instance-manager/instance.cc:
added some loging
server-tools/instance-manager/instance_map.cc:
All non-instance map specific functions moved from the class. Added
iterator for instance_map
server-tools/instance-manager/instance_map.h:
All non-instance map related functions moved from the class. Added
iterator for instance_map.
server-tools/instance-manager/listener.cc:
Added FD_CLOEXEC flag to sockets, as we don't want instances to inherit
them after exec.
server-tools/instance-manager/manager.cc:
use guardian method moved from the instance map
server-tools/instance-manager/mysql_connection.cc:
cleanup
server-tools/instance-manager/protocol.cc:
fix according to the changes in the Buffer class
Diffstat (limited to 'server-tools/instance-manager/protocol.cc')
-rw-r--r-- | server-tools/instance-manager/protocol.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server-tools/instance-manager/protocol.cc b/server-tools/instance-manager/protocol.cc index f32d8558fbf..2f1f95a5f05 100644 --- a/server-tools/instance-manager/protocol.cc +++ b/server-tools/instance-manager/protocol.cc @@ -101,14 +101,14 @@ char *net_store_length(char *pkg, uint length) void store_to_string(Buffer *buf, const char *string, uint *position) { - char* currpos; + uint currpos; uint string_len; string_len= strlen(string); buf->reserve(*position, 2); - currpos= net_store_length(buf->buffer + *position, string_len); + currpos= (net_store_length(buf->buffer + *position, string_len) - buf->buffer); buf->append(currpos, string, string_len); - *position= *position + string_len + (currpos - buf->buffer - *position); + *position= *position + string_len + (currpos - *position); } |