database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Vladislav Vaintroub
2011-03-28 12:57:52 +02:00
parent 9762b236d4 90b5afaab6
commit 262dd32045
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/mysql-test-run.pl
View File

@@ -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");

2
sql/mysqld.cc
View File

@@ -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:

3
win/packaging/create_msi.cmake.in
View File

@@ -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