summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2010-12-01 21:37:03 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2010-12-01 21:37:03 +0100
commitc87923dc2d3f6b5e96d51957937be8a5b343ab51 (patch)
treeb2aa4348ad143b02bb0c44e1c3adee989bfd4a85 /server-tools
parent6f279f40145624c1ffab06c63521f96ce4ac3a02 (diff)
downloadmariadb-git-c87923dc2d3f6b5e96d51957937be8a5b343ab51.tar.gz
Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings
- Remove all mentioning of /MAP /MAPINFO link options (does not work in VS2010). Remove map files from packaging. - Fix warning about ETIMEDOUT being redefined. - Fix warning about FSP_EXTENT_SIZE in xtradb (32/64 bit right shift mismatch) - Silence warnings coming from generated code (flex/bison) in xtradb/innodb_plugin. - Be nice to people without cygwin (me) and add win/configure-mariadb.bat with options suitable for quick compilation, e.g no embedded
Diffstat (limited to 'server-tools')
-rwxr-xr-xserver-tools/instance-manager/CMakeLists.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/server-tools/instance-manager/CMakeLists.txt b/server-tools/instance-manager/CMakeLists.txt
index c988a03912e..145373b23e3 100755
--- a/server-tools/instance-manager/CMakeLists.txt
+++ b/server-tools/instance-manager/CMakeLists.txt
@@ -21,7 +21,6 @@ ADD_DEFINITIONS(-DMYSQL_SERVER -DMYSQL_INSTANCE_MANAGER)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/sql
${PROJECT_SOURCE_DIR}/extra/yassl/include)
-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instance.cc instance_map.cc
instance_options.cc listener.cc log.cc manager.cc messages.cc mysql_connection.cc