Commit b2bbfcee authored by unknown's avatar unknown
Browse files

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

into  trift2.:/MySQL/M50/push-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
parents bdb9b448 bbcc4bb0

BUILD/check-cpu

+17 −9
Original line number Diff line number Diff line
@@ -164,26 +164,34 @@ check_cpu () { 


  cc_ver=`$cc --version | sed 1q`

  cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

  set -- `echo $cc_verno | tr '.' ' '`

  cc_major=$1

  cc_minor=$2

  cc_patch=$3

  cc_comp=`expr $cc_major '*' 100 '+' $cc_minor`



  case "$cc_ver--$cc_verno" in

    *GCC*)

        # different gcc backends (and versions) have different CPU flags

        case `gcc -dumpmachine` in

          i?86-*)

                case "$cc_verno" in

                      3.4*|3.5*|4.*)

                            check_cpu_args='-mtune=$cpu_arg -march=$cpu_arg'

                            ;;

                      *)

                            check_cpu_args='-mcpu=$cpu_arg -march=$cpu_arg'

                            ;;

            esac

	    if test "$cc_comp" -lt 304

            then

                            check_cpu_args='-mcpu=$cpu_arg'

            else

                            check_cpu_args='-mtune=$cpu_arg'

            fi

            ;;

          ppc-*)

                    check_cpu_args='-mcpu=$cpu_arg -mtune=$cpu_arg'

            ;;

          x86_64-*)

	    if test "$cc_comp" -lt 304

            then

                            check_cpu_args='-mcpu=$cpu_arg'

            else

                            check_cpu_args='-mtune=$cpu_arg'

            fi

            ;;

          *)

            check_cpu_cflags=""

CMakeLists.txt

+8 −0
Original line number Diff line number Diff line
@@ -86,13 +86,17 @@ ENDIF(CYBOZU) 


# in some places we use DBUG_OFF

SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")

SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D DBUG_OFF")

SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF")

SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D DBUG_OFF")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /wd4996")

    SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /wd4996")

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
@@ -104,10 +108,14 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
	       ${CMAKE_C_FLAGS_DEBUG_INIT})

	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE 

	       ${CMAKE_C_FLAGS_RELEASE})

	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO 

	       ${CMAKE_C_FLAGS_RELWITHDEBINFO})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG 

	       ${CMAKE_C_FLAGS_DEBUG})

	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE 

	       ${CMAKE_CXX_FLAGS_RELEASE})

	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO 

	       ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG 

	       ${CMAKE_CXX_FLAGS_DEBUG})

Docs/.cvsignore

+1 −36
Original line number Diff line number Diff line 
COPYING

COPYING.LIB

INSTALL-SOURCE

INSTALL-BINARY

Makefile

Makefile.in

Manual-updates

before-gpl-changes-manual.texi

include.texi

manual-before-gpl.texi

manual-tmp.aux

manual-tmp.cp

manual-tmp.fn

manual-tmp.ky

manual-tmp.log

manual-tmp.pdf

manual-tmp.pg

manual-tmp.texi

manual-tmp.toc

manual-tmp.tp

manual-tmp.vr

manual.aux

manual.cp

manual.cps

manual.fn

manual.fns

manual.html

manual.ky

manual.log

manual.pdf

manual.pg

manual.toc

manual.tp

manual.txt

manual.vr

manual_a4.ps

manual_a4.ps.gz

manual_letter.ps

manual_letter.ps.gz

manual_toc.html

mysql.info

Docs/Books/algor.eps

deleted100644 → 0
+0 −1419

File deleted.

Preview size limit exceeded, changes collapsed.

Docs/Books/algor.gif

deleted100644 → 0
−14.6 KiB
Loading image diff...