mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
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
This commit is contained in:
@@ -122,6 +122,7 @@ int store_to_string(Buffer *buf, const char *string, uint *position,
|
||||
{
|
||||
uint currpos;
|
||||
|
||||
/* reserve max amount of bytes needed to store length */
|
||||
if (buf->reserve(*position, 9))
|
||||
goto err;
|
||||
currpos= (net_store_length(buf->buffer + *position,
|
||||
@@ -175,10 +176,10 @@ int send_fields(struct st_net *net, LIST *fields)
|
||||
position= 0;
|
||||
field= (NAME_WITH_LENGTH *) tmp->data;
|
||||
|
||||
store_to_string(&send_buff, (char *) "", &position); /* catalog name */
|
||||
store_to_string(&send_buff, (char *) "", &position); /* db name */
|
||||
store_to_string(&send_buff, (char *) "", &position); /* table name */
|
||||
store_to_string(&send_buff, (char *) "", &position); /* table name alias */
|
||||
store_to_string(&send_buff, (char*) "", &position); /* catalog name */
|
||||
store_to_string(&send_buff, (char*) "", &position); /* db name */
|
||||
store_to_string(&send_buff, (char*) "", &position); /* table name */
|
||||
store_to_string(&send_buff, (char*) "", &position); /* table name alias */
|
||||
store_to_string(&send_buff, field->name, &position); /* column name */
|
||||
store_to_string(&send_buff, field->name, &position); /* column name alias */
|
||||
send_buff.reserve(position, 12);
|
||||
|
||||
Reference in New Issue
Block a user