Commit 06b22665 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

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

into  trift2.:/MySQL/M50/push-5.0
parents 3d203e55 8957e54a

CMakeLists.txt

+9 −8
Original line number Diff line number Diff line
@@ -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")

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -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"

mysql-test/suite/funcs_2/r/innodb_charset.result

+3 −3
Original line number Diff line number Diff line
@@ -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

mysql-test/suite/funcs_2/r/memory_charset.result

+3 −3
Original line number Diff line number Diff line
@@ -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

mysql-test/suite/funcs_2/r/myisam_charset.result

+3 −3
Original line number Diff line number Diff line
@@ -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