summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <df@kahlann.erinye.com>2006-12-20 17:52:59 +0100
committerunknown <df@kahlann.erinye.com>2006-12-20 17:52:59 +0100
commitbbb9ba764754f91b144b01db16a8f9b3f5d3dd67 (patch)
treefd44973bd24a929894986e9176fe73539eeed82b
parentfd0a4f225f0f1419f6d082d307ca9ebdb23c77ec (diff)
parentc4b4bd6982beb27a1ec45699ebce09de0bf4cdfc (diff)
downloadmariadb-git-bbb9ba764754f91b144b01db16a8f9b3f5d3dd67.tar.gz
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
-rwxr-xr-xBUILD/check-cpu30
-rwxr-xr-xmysql-test/mysql-test-run.pl6
-rw-r--r--mysql-test/t/myisam.test2
-rw-r--r--mysql-test/t/query_cache_notembedded.test4
-rw-r--r--mysql-test/t/rpl_000015.test2
-rw-r--r--mysql-test/t/rpl_rotate_logs.test2
6 files changed, 38 insertions, 8 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index d85adf21d71..c438f40fa61 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -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";
;;
@@ -120,7 +137,14 @@ check_cpu () {
esac
- if test -z "$cpu_arg"; then
+ 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
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 73755cd2df9..ccee36025ee 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -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]=
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 5a663718878..8d5502fe28f 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -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;
diff --git a/mysql-test/t/query_cache_notembedded.test b/mysql-test/t/query_cache_notembedded.test
index 802022d061b..a0085c0ba31 100644
--- a/mysql-test/t/query_cache_notembedded.test
+++ b/mysql-test/t/query_cache_notembedded.test
@@ -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;
diff --git a/mysql-test/t/rpl_000015.test b/mysql-test/t/rpl_000015.test
index ffe7ab87632..4c557a7c713 100644
--- a/mysql-test/t/rpl_000015.test
+++ b/mysql-test/t/rpl_000015.test
@@ -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;
diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/t/rpl_rotate_logs.test
index 2249dff1449..0c5ed1a35a4 100644
--- a/mysql-test/t/rpl_rotate_logs.test
+++ b/mysql-test/t/rpl_rotate_logs.test
@@ -19,7 +19,7 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
--disable_warnings
drop table if exists t1, t2, t3, t4;
--enable_warnings
-connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
+connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info;
system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info;
connection slave;