database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixed typos and failed mysqld--help test.

Browse Source
This commit is contained in:
Vladislav Vaintroub
2010-01-26 22:05:41 +01:00
parent 0bdfa9d5eb
commit 1f07f5c18e
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/os/Windows.cmake
View File

@ -64,13 +64,17 @@ IF(MSVC)
SET(CMAKE_{type}_LINKER_FLAGS_RELEASE "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug") SET(CMAKE_{type}_LINKER_FLAGS_RELEASE "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
ENDFOREACH() ENDFOREACH()
# Force static runtime libraries, and remove support for exception handling # Force static runtime libraries
FOREACH(flag FOREACH(flag
CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO
CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT
CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO
CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG_INIT) CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG_INIT)
STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}") STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")
ENDFOREACH()
# Remove support for exceptions
FOREACH(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_INIT)
STRING(REPLACE "/EHsc" "" "${flag}" "${${flag}}") STRING(REPLACE "/EHsc" "" "${flag}" "${${flag}}")
ENDFOREACH() ENDFOREACH()

5
cmake/plugin.cmake
View File

@ -111,10 +111,9 @@ MACRO(MYSQL_ADD_PLUGIN)
# Update mysqld dependencies # Update mysqld dependencies
SET (MYSQLD_STATIC_PLUGIN_LIBS ${MYSQLD_STATIC_PLUGIN_LIBS} SET (MYSQLD_STATIC_PLUGIN_LIBS ${MYSQLD_STATIC_PLUGIN_LIBS}
${target} CACHE INTERNAL "") ${target} CACHE INTERNAL "" FORCE)
IF(NOT ARG_MANDATORY)
IF(ARG_STORAGE_ENGINE)
SET(${with_var} ON CACHE BOOL "Link ${plugin} statically to the server" SET(${with_var} ON CACHE BOOL "Link ${plugin} statically to the server"
FORCE) FORCE)
ENDIF() ENDIF()

1
configure.cmake
View File

@ -182,7 +182,6 @@ IF(UNIX)
ENDIF() ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()
s
# System check macros that do nothing on Windows. # System check macros that do nothing on Windows.
# Very often, it is known that some function is not available # Very often, it is known that some function is not available

2
mysql-test/include/mysqld--help.inc
View File

@ -14,7 +14,7 @@ perl;
log-slow-queries pid-file slow-query-log-file log-slow-queries pid-file slow-query-log-file
datadir slave-load-tmpdir tmpdir/; datadir slave-load-tmpdir tmpdir/;
@plugins=qw/innodb ndb archive blackhole federated partition ndbcluster safemalloc debug temp-pool ssl des-key-file @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster safemalloc debug temp-pool ssl des-key-file
thread-concurrency super-large-pages mutex-deadlock-detector/; thread-concurrency super-large-pages mutex-deadlock-detector null-audit/;
@env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_CHARSETSDIR MYSQL_SHAREDIR /; @env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_CHARSETSDIR MYSQL_SHAREDIR /;
$re1=join('|', @skipvars, @plugins); $re1=join('|', @skipvars, @plugins);
$re2=join('|', @plugins); $re2=join('|', @plugins);