Commit e963a7cd authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-ndb-bj 

into  bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb


client/mysqltest.c:
  Auto merged
include/config-netware.h:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
storage/csv/ha_tina.cc:
  manual merge.
storage/innobase/btr/btr0btr.c:
  SCCS merged
storage/innobase/buf/buf0buf.c:
  SCCS merged
storage/innobase/dict/dict0dict.c:
  SCCS merged
storage/innobase/fil/fil0fil.c:
  SCCS merged
storage/innobase/fsp/fsp0fsp.c:
  SCCS merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged
storage/innobase/include/btr0cur.ic:
  use local
storage/innobase/include/buf0buf.ic:
  SCCS merged
storage/innobase/log/log0log.c:
  SCCS merged
storage/innobase/log/log0recv.c:
  SCCS merged
storage/innobase/os/os0file.c:
  SCCS merged
storage/innobase/row/row0mysql.c:
  SCCS merged
storage/innobase/row/row0sel.c:
  SCCS merged
storage/innobase/srv/srv0start.c:
  SCCS merged
storage/innobase/ut/ut0dbg.c:
  SCCS merged
parents af8903b2 8c6a9560

.bzrignore

+1126 −0

File changed.

Preview size limit exceeded, changes collapsed.

BUILD/SETUP.sh

+3 −9
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ parse_options() 


########################################################################



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
@@ -185,12 +185,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/autorun.sh

+0 −5
Original line number Diff line number Diff line
@@ -11,11 +11,6 @@ if [ -f /usr/bin/glibtoolize ] 
    LIBTOOLIZE=libtoolize

fi



(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && \

    $LIBTOOLIZE --automake --force --copy && \

    automake --force --add-missing --copy && autoconf)



aclocal || die "Can't execute aclocal" 

autoheader || die "Can't execute autoheader"

# --force means overwrite ltmain.sh script if it already exists

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