Commit 5326bdc6 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/myisam/Makefile.am:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/myrg_open.c:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
parents 9bfa6d1a 21eed96b

BUILD/SETUP.sh

+8 −5
Original line number Diff line number Diff line
@@ -53,11 +53,14 @@ max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --wit 
max_no_es_configs="$max_leave_isam_configs --without-isam"

max_configs="$max_no_es_configs --with-embedded-server"



alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet

amd64_cflags=""				# If dropping '--with-big-tables', add here  "-DBIG_TABLES"

pentium_cflags="-mcpu=pentiumpro"

pentium64_cflags="-mcpu=nocona -m64"

ppc_cflags="-mpowerpc -mcpu=powerpc"

path=`dirname $0`

. "$path/check-cpu"



alpha_cflags="$check_cpu_cflags -Wa,-m$cpu_flag"

amd64_cflags="$check_cpu_cflags"

pentium_cflags="$check_cpu_cflags"

pentium64_cflags="$check_cpu_cflags -m64"

ppc_cflags="$check_cpu_cflags"

sparc_cflags=""



# be as fast as we can be without losing our ability to backtrace

BUILD/check-cpu

0 → 100755
+81 −0
Original line number Diff line number Diff line 
#!/bin/sh

#

# Check cpu of current machine and find the

# best compiler optimization flags for gcc

#

#



if test -r /proc/cpuinfo ; then

  cpuinfo="cat /proc/cpuinfo"

  cpu_family=`$cpuinfo | grep 'family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`

  if test -z "$cpu_family" ; then

    cpu_family=`$cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`

  fi

  cpu_vendor=`$cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`

  model_name=`$cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`

  if test -z "$model_name" ; then

    model_name=`$cpuinfo | grep 'cpu model' | cut -d ':' -f 2 | head -1`

  fi

  if test -z "$model_name" ; then

    model_name=`uname -m`

  fi

fi



case "$cpu_family--$model_name" in

  Alpha*EV6*)

    cpu_flag="ev6";

    ;;

  *Xeon*)

    cpu_flag="nocona";

    ;;

  *Pentium*4*CPU*)

    cpu_flag="pentium4";

    ;;

  *Athlon*64*)

    cpu_flag="athlon64";

    ;;

  *Athlon*)

    cpu_flag="athlon";

    ;;

  *Itanium*)

    # Don't need to set any flags for itanium(at the moment)

    cpu_flag="";

    ;;

  *ppc)

    cpu_flag="powerpc";

    ;;

  *)

    cpu_flag="";

    ;;

esac



if test -z "$cpu_flag"; then

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

  check_cpu_flags=""

  return

fi



echo "cpu_flag: $cpu_flag"



if test -z "$CC" ; then

  cc="gcc";

else

  cc=$CC



fi



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

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



case "$cc_ver--$cc_verno" in

  *GCC*--3.4*|*GCC*--3.5*|*GCC*--4.*)

    check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag"

    ;;

  *GCC*)

    check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag"

    ;;

  *)

    check_cpu_cflags=""

    ;;

esac

echo $check_cpu_cflags

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ dlenev@build.mysql.com 
dlenev@jabberwock.localdomain

dlenev@mysql.com

ejonore@mc03.ndb.mysql.com

evgen@moonbone.(none)

evgen@moonbone.local

gbichot@production.mysql.com

gbichot@quadita2.mysql.com

gbichot@quadxeon.mysql.com

Makefile.am

+5 −0
Original line number Diff line number Diff line
@@ -102,5 +102,10 @@ tags: 
test:

	cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol



test-force:

	cd mysql-test; \

	mysql-test-run --force ;\

	mysql-test-run --ps-protocol --force



# Don't update the files from bitkeeper

%::SCCS/s.%

client/mysql.cc

+13 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include <locale.h>

#endif



const char *VER= "14.9";

const char *VER= "14.10";



/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024
@@ -235,7 +235,7 @@ static COMMANDS commands[] = { 
  { "connect",'r', com_connect,1,

    "Reconnect to the server. Optional arguments are db and host." },

  { "delimiter", 'd', com_delimiter,    1,

    "Set query delimiter. " },

    "Set statement delimiter. NOTE: Takes the rest of the line as new delimiter." },

#ifdef USE_POPEN

  { "edit",   'e', com_edit,   0, "Edit command with $EDITOR."},

#endif
@@ -703,8 +703,16 @@ static void usage(int version) 
#ifdef __NETWARE__

#define printf	consoleprintf

#endif

  printf("%s  Ver %s Distrib %s, for %s (%s)\n",

	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);



#if defined(USE_LIBEDIT_INTERFACE)

  const char* readline= "";

#else

  const char* readline= "readline";

#endif



  printf("%s  Ver %s Distrib %s, for %s (%s) using %s %s\n",

	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,

         readline, rl_library_version);

  if (version)

    return;

  printf("\
@@ -1323,7 +1331,7 @@ static void initialize_readline (char *name) 
  setlocale(LC_ALL,""); /* so as libedit use isprint */

#endif

  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;

  rl_completion_entry_function= (CPFunction*)&no_completion;

  rl_completion_entry_function= (Function*)&no_completion;

#else

  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;

  rl_completion_entry_function= (Function*)&no_completion;