mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +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:
@ -70,7 +70,7 @@ static inline void log(FILE *file, const char *format, va_list args)
|
||||
if (n < 0 || n == sizeof(buff_stack))
|
||||
{
|
||||
int size= sizeof(buff_stack) * 2;
|
||||
buff_msg= (char *) my_malloc(size, 0);
|
||||
buff_msg= (char*) my_malloc(size, MYF(0));
|
||||
while (true)
|
||||
{
|
||||
if (buff_msg == 0)
|
||||
@ -86,16 +86,16 @@ static inline void log(FILE *file, const char *format, va_list args)
|
||||
size*= 2;
|
||||
/* realloc() does unnecessary memcpy */
|
||||
my_free(buff_msg, 0);
|
||||
buff_msg= (char *) my_malloc(size, 0);
|
||||
buff_msg= (char*) my_malloc(size, MYF(0));
|
||||
}
|
||||
}
|
||||
else if ((size_t) n > sizeof(buff_stack))
|
||||
{
|
||||
buff_msg= (char *) my_malloc(n + 1, 0);
|
||||
buff_msg= (char*) my_malloc(n + 1, MYF(0));
|
||||
#ifdef DBUG
|
||||
DBUG_ASSERT(n == vsnprintf(buff_msg, n + 1, format, args));
|
||||
#else
|
||||
vsnprintf(buff_msg, n + 1, format, args);
|
||||
vsnprintf(buff_msg, n + 1, format, args);
|
||||
#endif
|
||||
}
|
||||
fprintf(file, "%s%s\n", buff_date, buff_msg);
|
||||
|
Reference in New Issue
Block a user