Skip to content

Commit

Permalink
MDEV-16430: mysql_upgrade_service does not write log file.
Browse files Browse the repository at this point in the history
Fixed  CreateFile() for the log file
- TRUNCATE_EXISTING does not create a new file, use CREATE_ALWAYS
- Make log file handle inheritable
  • Loading branch information
vaintroub committed Jun 8, 2018
1 parent 55abcfa commit 141bc58
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions sql/mysql_upgrade_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,11 @@ static void die(const char *fmt, ...)
exit(1);
}

#define WRITE_LOG(fmt,...) {\
char log_buf[1024]; \
snprintf(log_buf,sizeof(log_buf), fmt, __VA_ARGS__);\
WriteFile(logfile_handle,log_buf, strlen(log_buf), 0 , 0);\
}

/*
spawn-like function to run subprocesses.
Expand Down Expand Up @@ -187,17 +192,22 @@ static intptr_t run_tool(int wait_flag, const char *program,...)
{
char tmpdir[FN_REFLEN];
GetTempPath(FN_REFLEN, tmpdir);
sprintf_s(logfile_path, "%s\\mysql_upgrade_service.%s.log", tmpdir,
sprintf_s(logfile_path, "%smysql_upgrade_service.%s.log", tmpdir,
opt_service);
logfile_handle= CreateFile(logfile_path, GENERIC_WRITE, FILE_SHARE_READ,
NULL, TRUNCATE_EXISTING, 0, NULL);
if (!logfile_handle)
SECURITY_ATTRIBUTES attr= {0};
attr.nLength= sizeof(SECURITY_ATTRIBUTES);
attr.bInheritHandle= TRUE;
logfile_handle= CreateFile(logfile_path, FILE_APPEND_DATA,
FILE_SHARE_READ|FILE_SHARE_WRITE, &attr, CREATE_ALWAYS, 0, NULL);
if (logfile_handle == INVALID_HANDLE_VALUE)
{
die("Cannot open log file %s, windows error %u",
logfile_path, GetLastError());
}
}

WRITE_LOG("Executing %s\r\n", cmdline);

/* Start child process */
STARTUPINFO si= {0};
si.cb= sizeof(si);
Expand Down

0 comments on commit 141bc58

Please sign in to comment.