Commit e9d019f7 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.0-ndb 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb-bj


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
ndb/src/mgmclient/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
ndb/tools/ndb_config.cpp:
  merge
parents c55f25ca 81526834

.bzrignore

+3 −1
Original line number Diff line number Diff line
@@ -671,6 +671,7 @@ mysql-test/*.ds? 
mysql-test/*.vcproj

mysql-test/gmon.out

mysql-test/install_test_db

mysql-test/mtr

mysql-test/mysql-test-run

mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new
@@ -913,6 +914,7 @@ ndb/src/common/mgmcommon/printConfig/*.d 
ndb/src/common/portlib/libportlib.dsp

ndb/src/common/transporter/libtransporter.dsp

ndb/src/common/util/libgeneral.dsp

ndb/src/common/util/testBitmask.cpp

ndb/src/cw/cpcd/ndb_cpcd

ndb/src/dummy.cpp

ndb/src/kernel/blocks/backup/libbackup.dsp
@@ -1138,6 +1140,7 @@ sql/*.ds? 
sql/*.vcproj

sql/.gdbinit

sql/client.c

sql/f.c

sql/gen_lex_hash

sql/gmon.out

sql/lex_hash.h
@@ -1296,4 +1299,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
ndb/src/common/util/testBitmask.cpp

BUILD/SETUP.sh

+3 −9
Original line number Diff line number Diff line 
#!/bin/sh



if ! test -f sql/mysqld.cc

if test ! -f sql/mysqld.cc

then

  echo "You must run this script from the MySQL top-level directory"

  exit 1
@@ -122,12 +122,6 @@ fi 
# (returns 0 if finds lines)

if ccache -V > /dev/null 2>&1

then

  if ! (echo "$CC" | grep "ccache" > /dev/null)

  then

    CC="ccache $CC"

  fi

  if ! (echo "$CXX" | grep "ccache" > /dev/null)

  then

    CXX="ccache $CXX"

  fi

  echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC"

  echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX"

fi

BUILD/check-cpu

+189 −182
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
# Check cpu of current machine and find the

# best compiler optimization flags for gcc

#

#



check_cpu () {

  if test -r /proc/cpuinfo ; then

    # on Linux (and others?) we can get detailed CPU information out of /proc

    cpuinfo="cat /proc/cpuinfo"
@@ -93,6 +93,10 @@ case "$cpu_family--$model_name" in 
    *Opteron*)

      cpu_arg="opteron";

      ;;

    # MacOSX / Intel  

    *i386*i486*)

      cpu_arg="pentium-m";

      ;;



    # Intel ia64

    *Itanium*)
@@ -117,7 +121,7 @@ esac 




  if test -z "$cpu_arg"; then

  echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using."

    echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using." >&2

    check_cpu_cflags=""

    return

  fi
@@ -131,7 +135,7 @@ else 
  fi



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

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

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



  case "$cc_ver--$cc_verno" in

    *GCC*)
@@ -173,16 +177,17 @@ esac 
  touch __test.c



  while [ "$cpu_arg" ] ; do

  echo -n testing $cpu_arg "... "

    # FIXME: echo -n isn't portable - see contortions autoconf goes through

    echo -n testing $cpu_arg "... " >&2

          

    # compile check

    check_cpu_cflags=`eval echo $check_cpu_args`

    if $cc -c $check_cpu_cflags __test.c 2>/dev/null; then

	  echo ok

            echo ok >&2

        break;

    fi



  echo failed

    echo failed >&2

    check_cpu_cflags=""



    # if compile failed: check whether it supports a predecessor of this CPU
@@ -208,4 +213,6 @@ while [ "$cpu_arg" ] ; do 
  done



  rm __test.*

}



check_cpu

BitKeeper/etc/collapsed

+3 −0
Original line number Diff line number Diff line 
44d03f27qNdqJmARzBoP3Is_cN5e0w

44ec850ac2k4y2Omgr92GiWPBAVKGQ

44edb86b1iE5knJ97MbliK_3lCiAXA

44f33f3aj5KW5qweQeekY1LU0E9ZCg

CMakeLists.txt

0 → 100755
+132 −0
Original line number Diff line number Diff line 
PROJECT(MySql)



# This reads user configuration, generated by configure.js.

INCLUDE(win/configure.data)



CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in

               ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)



# Set standard options

ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE)

ADD_DEFINITIONS(-D CMAKE_BUILD)

ADD_DEFINITIONS(-D HAVE_YASSL)



SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisam_plugin")





IF(WITH_ARCHIVE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D HAVE_ARCHIVE_DB)

ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)



IF (WITH_HEAP_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_HEAP_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_heap_plugin")

ENDIF (WITH_HEAP_STORAGE_ENGINE)



IF (WITH_MYISAMMRG_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_MYISAMMRG_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisammrg_plugin")

ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)



IF(WITH_INNOBASE_STORAGE_ENGINE)

  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/innobase/ib_config.h.in

               ${CMAKE_SOURCE_DIR}/innobase/ib_config.h @ONLY)

  ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)

  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)



IF(WITH_FEDERATED_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D HAVE_FEDERATED_DB)

  ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_federated_plugin")

ENDIF(WITH_FEDERATED_STORAGE_ENGINE)



IF(WITH_BERKELEY_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D HAVE_BERKELEY_DB)

  ADD_DEFINITIONS(-D WITH_BERKELEY_STORAGE_ENGINE)

  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_berkeley_plugin")

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)



IF (WITH_BLACKHOLE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D HAVE_BLACKHOLE_DB)

ENDIF (WITH_BLACKHOLE_STORAGE_ENGINE)



SET(localstatedir "C:\\mysql\\data")

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-huge.cnf.sh

               ${CMAKE_SOURCE_DIR}/support-files/my-huge.ini @ONLY)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-innodb-heavy-4G.cnf.sh

               ${CMAKE_SOURCE_DIR}/support-files/my-innodb-heavy-4G.ini @ONLY)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-large.cnf.sh

               ${CMAKE_SOURCE_DIR}/support-files/my-large.ini @ONLY)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-medium.cnf.sh

               ${CMAKE_SOURCE_DIR}/support-files/my-medium.ini @ONLY)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-small.cnf.sh

               ${CMAKE_SOURCE_DIR}/support-files/my-small.ini @ONLY)



IF(__NT__)

  ADD_DEFINITIONS(-D __NT__)

ENDIF(__NT__)

IF(CYBOZU)

  ADD_DEFINITIONS(-D CYBOZU)

ENDIF(CYBOZU)



# in some places we use DBUG_OFF

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

SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -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_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")

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

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 

   CMAKE_GENERATOR MATCHES "Visual Studio 8")

	# replace /MDd with /MTd

	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG_INIT 

	       ${CMAKE_CXX_FLAGS_DEBUG_INIT})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG_INIT 

	       ${CMAKE_C_FLAGS_DEBUG_INIT})

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

	       ${CMAKE_C_FLAGS_RELEASE})

	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 "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG 

	       ${CMAKE_CXX_FLAGS_DEBUG})



	# remove support for Exception handling

	STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT 

	       ${CMAKE_CXX_FLAGS_INIT})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT 

	       ${CMAKE_CXX_FLAGS_DEBUG_INIT})

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 

      CMAKE_GENERATOR MATCHES "Visual Studio 8")



ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE")



ADD_SUBDIRECTORY(vio)

ADD_SUBDIRECTORY(dbug)

ADD_SUBDIRECTORY(strings)

ADD_SUBDIRECTORY(regex)

ADD_SUBDIRECTORY(mysys)

ADD_SUBDIRECTORY(extra/yassl)

ADD_SUBDIRECTORY(extra/yassl/taocrypt)

ADD_SUBDIRECTORY(extra)

ADD_SUBDIRECTORY(zlib)

ADD_SUBDIRECTORY(heap)

ADD_SUBDIRECTORY(myisam)

ADD_SUBDIRECTORY(myisammrg)

ADD_SUBDIRECTORY(client)

ADD_SUBDIRECTORY(bdb)

ADD_SUBDIRECTORY(innobase)

ADD_SUBDIRECTORY(sql)

ADD_SUBDIRECTORY(sql/examples)

ADD_SUBDIRECTORY(server-tools/instance-manager)

ADD_SUBDIRECTORY(libmysql)

ADD_SUBDIRECTORY(tests)