mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge trift2.:/MySQL/M50/mysql-5.0

Browse source 
into  trift2.:/MySQL/M50/push-5.0
This commit is contained in:
joerg@trift2. 2007-10-19 11:18:15 +02:00
commit 06b226658b
6 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CMakeLists.txt
View file

@ -109,6 +109,15 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT ${CMAKE_CXX_FLAGS_INIT})
STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT})
# Disable automatic manifest generation.
STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS
${CMAKE_EXE_LINKER_FLAGS})
# Explicitly disable it since it is the default for newer versions of VS
STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
IF(NOT tmp_manifest)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
ENDIF(NOT tmp_manifest)
ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
CMAKE_GENERATOR MATCHES "Visual Studio 8")
@ -156,14 +165,6 @@ IF(EMBED_MANIFESTS)
MESSAGE(FATAL_ERROR "Sign tool, signtool.exe, can't be found.")
ENDIF(HAVE_SIGN_TOOL)
# Disable automatic manifest generation.
STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS
${CMAKE_EXE_LINKER_FLAGS})
# Explicitly disable it since it is the default for newer versions of VS
STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
IF(NOT tmp_manifest)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
ENDIF(NOT tmp_manifest)
# Set the processor architecture.
IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
SET(PROCESSOR_ARCH "amd64")

2
configure.in
View file

@ -631,7 +631,7 @@ AC_SUBST(NOINST_LDFLAGS)
if test "$TARGET_LINUX" = "true" -a "$static_nss" = ""
then
tmp=`nm /usr/lib/libc.a | grep _nss_files_getaliasent_r`
tmp=`nm /usr/lib*/libc.a | grep _nss_files_getaliasent_r`
if test -n "$tmp"
then
STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"

6
mysql-test/suite/funcs_2/r/innodb_charset.result
View file

@ -737,7 +737,6 @@ a_ascii a_len
44 1
64 1
45 1
60 1
65 1
46 1
66 1
@ -779,17 +778,18 @@ a_ascii a_len
78 1
59 1
79 1
7E 1
5A 1
7A 1
5D 1
5B 1
5C 1
5D 1
5E 1
5F 1
60 1
7B 1
7C 1
7D 1
7E 1
7F 1
80 1
81 1

6
mysql-test/suite/funcs_2/r/memory_charset.result
View file

@ -737,7 +737,6 @@ a_ascii a_len
44 1
64 1
45 1
60 1
65 1
46 1
66 1
@ -779,17 +778,18 @@ a_ascii a_len
78 1
59 1
79 1
7E 1
5A 1
7A 1
5D 1
5B 1
5C 1
5D 1
5E 1
5F 1
60 1
7B 1
7C 1
7D 1
7E 1
7F 1
80 1
81 1

6
mysql-test/suite/funcs_2/r/myisam_charset.result
View file

@ -737,7 +737,6 @@ a_ascii a_len
44 1
64 1
45 1
60 1
65 1
46 1
66 1
@ -779,17 +778,18 @@ a_ascii a_len
78 1
59 1
79 1
7E 1
5A 1
7A 1
5D 1
5B 1
5C 1
5D 1
5E 1
5F 1
60 1
7B 1
7C 1
7D 1
7E 1
7F 1
80 1
81 1

6
mysql-test/suite/funcs_2/r/ndb_charset.result
View file

@ -737,7 +737,6 @@ a_ascii a_len
44 1
64 1
45 1
60 1
65 1
46 1
66 1
@ -779,17 +778,18 @@ a_ascii a_len
78 1
59 1
79 1
7E 1
5A 1
7A 1
5D 1
5B 1
5C 1
5D 1
5E 1
5F 1
60 1
7B 1
7C 1
7D 1
7E 1
7F 1
80 1
81 1