Commit 262dd320 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

merge

parents 9762b236 90b5afaa
......@@ -1400,6 +1400,9 @@ sub command_line_setup {
# Turn off use of bin log
push(@opt_extra_mysqld_opt, "--skip-log-bin");
# Write errors to stderr, not to mysqld.1.err
push(@opt_extra_mysqld_opt, "--disable-log-error");
if ( using_extern() )
{
mtr_error("Can't use --extern with --embedded-server");
......
......@@ -8773,7 +8773,7 @@ mysqld_get_one_option(int optid,
break;
}
case (int) OPT_ERROR_LOG_FILE:
opt_error_log= 1;
opt_error_log= (argument != disabled_my_option);
break;
#ifdef HAVE_REPLICATION
case (int) OPT_INIT_RPL_ROLE:
......
......@@ -20,7 +20,6 @@ SET(CPACK_WIX_PACKAGE_BASE_NAME "@CPACK_WIX_PACKAGE_BASE_NAME@")
SET(SIGNCODE "@SIGNCODE@")
SET(SIGNTOOL_EXECUTABLE "@SIGNTOOL_EXECUTABLE@")
SET(SIGNTOOL_PARAMETERS "@SIGNTOOL_PARAMETERS@")
SET(SIGNCODE_ENABLED "@SIGNCODE_ENABLED@")
SET(CMAKE_FULL_VER
"@CMAKE_MAJOR_VERSION@.@CMAKE_MINOR_VERSION@.@CMAKE_PATCH_VERSION@")
SET(EXTRA_WIX_PREPROCESSOR_FLAGS "@EXTRA_WIX_PREPROCESSOR_FLAGS@")
......@@ -400,7 +399,7 @@ EXECUTE_PROCESS(
${EXTRA_LIGHT_ARGS}
)
IF(SIGNCODE AND SIGNCODE_ENABLED)
IF(SIGNCODE)
EXECUTE_PROCESS(
COMMAND ${SIGNTOOL_EXECUTABLE} sign ${SIGNTOOL_PARAMETERS}
${CPACK_PACKAGE_FILE_NAME}.msi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment