Commit bbb9ba76 authored by unknown's avatar unknown
Browse files

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work


BUILD/check-cpu:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl000017.test:
  change from 5.0 does not apply here anymore
mysql-test/t/rpl_000015.test:
  after-merge fix
parents fd0a4f22 c4b4bd69

BUILD/check-cpu

+27 −3
Original line number Diff line number Diff line
@@ -5,9 +5,13 @@ 
#



check_cpu () {

  if test -r /proc/cpuinfo ; then

  CPUINFO=/proc/cpuinfo

  if test -n "$TEST_CPUINFO" ; then

    CPUINFO=$TEST_CPUINFO

  fi

  if test -r "$CPUINFO" -a "$CPUINFO" != " " ; then

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

    cpuinfo="cat /proc/cpuinfo"

    cpuinfo="cat $CPUINFO"



    # detect CPU family

    cpu_family=`$cpuinfo | grep 'family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
@@ -33,6 +37,7 @@ check_cpu () { 
    done

  else

    # Fallback when there is no /proc/cpuinfo

    CPUINFO=" "

    case "`uname -s`" in

      FreeBSD|OpenBSD)

        cpu_family=`uname -m`;
@@ -84,6 +89,18 @@ check_cpu () { 
    *Pentium*M*pro*)

      cpu_arg="pentium-m";

    ;;

    *Celeron\(R\)*\ M*)

      cpu_arg="pentium-m";

    ;;

    *Celeron*Coppermine*)

      cpu_arg="pentium3"

    ;;

    *Celeron\(R\)*)

      cpu_arg="pentium4"

    ;;

    *Celeron*)

      cpu_arg="pentium2";

    ;;

    *Athlon*64*)

      cpu_arg="athlon64";

      ;;
@@ -121,6 +138,13 @@ check_cpu () { 




  if test -z "$cpu_arg" ; then

    if test "$CPUINFO" != " " ; then

      # fallback to uname if necessary

      TEST_CPUINFO=" "

      check_cpu_cflags=""

      check_cpu

      return

    fi

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

    check_cpu_cflags=""

    return

mysql-test/mysql-test-run.pl

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ $Devel::Trace::TRACE= 0; # Don't trace boring init stuff 
use File::Path;

use File::Basename;

use File::Copy;

use File::Temp qw / tempdir /;

use Cwd;

use Getopt::Long;

use Sys::Hostname;
@@ -1020,6 +1021,11 @@ sub command_line_setup () { 
  my $sockdir = $opt_tmpdir;

  $sockdir =~ s|/+$||;



  # On some operating systems, there is a limit to the length of a

  # UNIX domain socket's path far below PATH_MAX, so try to avoid long

  # socket path names.

  $sockdir = tempdir(CLEANUP => 1) if ( length($sockdir) > 80 );



  # Put this into a hash, will be a C struct



  $master->[0]=

mysql-test/t/myisam.test

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ insert into t1 values (1),(2),(3),(4),(5),(6); 
insert into t2 values (1,1),(2,1);

lock tables t1 read local, t2 read local;

select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;

connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);

connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);

insert into t2 values(2,0);

disconnect root;

connection default;

mysql-test/t/query_cache_notembedded.test

+2 −2
Original line number Diff line number Diff line
@@ -81,12 +81,12 @@ drop table t1, t2, t3, t11, t21; 
#

# do not use QC if tables locked (BUG#12385)

#

connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);

connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);

connection root;

CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE =

MyISAM;

LOCK TABLE t1 READ LOCAL;

connect (root2,localhost,root,,test,$MASTER_MYPORT,master.sock);

connect (root2,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);

connection root2;

INSERT INTO t1 VALUES (), (), ();

connection root;

mysql-test/t/rpl_000015.test

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
##################### 



connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);

connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);

connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);

connection master;

reset master;

show master status;