From cdd5a353c4d0443e207a97a99fe05ed3eb2cbd37 Mon Sep 17 00:00:00 2001
From: unknown <df@kahlann.erinye.com>
Date: Wed, 20 Dec 2006 17:42:44 +0100
Subject: [PATCH 1/3] BUG#20061 build script can not detect my cpu

BUILD/check-cpu:
  add a handful of Celeroni and automatic fallback to uname if /proc/cpuinfo is there but we don't understand the information in it
---
 BUILD/check-cpu | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index e207d12d972..bde6879e664 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";
       ;;
@@ -113,7 +130,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

From 81cf3b8051bfda2c23cc96fa78c6362253fa48ff Mon Sep 17 00:00:00 2001
From: unknown <df@kahlann.erinye.com>
Date: Tue, 9 Jan 2007 09:32:56 +0100
Subject: [PATCH 2/3] BUG#24780 workaround for broken installations that depend
 on using /etc, but were configured differently

scripts/mysqlaccess.sh:
  also look in /etc
scripts/mysqld_multi.sh:
  also look in /etc
---
 scripts/mysqlaccess.sh  | 4 ++++
 scripts/mysqld_multi.sh | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index 22e9d121f9a..bcaf9f8af8e 100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
@@ -465,6 +465,9 @@ MySQLaccess::Report::Print_Header();
   elsif (-f "@sysconfdir@/$script_conf") {
      require "@sysconfdir@/$script_conf";
   }
+  elsif (-f "/etc/$script_conf") {
+     require "/etc/$script_conf";
+  }
 
 # ****************************
 # Read in all parameters
@@ -930,6 +933,7 @@ sub MergeConfigFile {
 sub MergeConfigFiles {
     my ($name,$pass,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwuid $<;
     MergeConfigFile("@sysconfdir@/my.cnf");
+    MergeConfigFile("/etc/my.cnf");
     MergeConfigFile("$dir/.my.cnf");
 }
 
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index ce778c03206..8b435161e47 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -432,6 +432,9 @@ sub find_groups
     if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")
     {
       open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
+    } elsif (-f "/etc/my.cnf" && -r "/etc/my.cnf")
+    {
+      open(MY_CNF, "</etc/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
     }
     for ($i = 0; ($line = shift @tmp); $i++)
     {

From 4f69569dfa77e9115418ce4b1982ec00a106a660 Mon Sep 17 00:00:00 2001
From: unknown <df@kahlann.erinye.com>
Date: Mon, 22 Jan 2007 16:32:57 +0100
Subject: [PATCH 3/3] after-merge fix

---
 mysql-test/mysql-test-run.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 8cb33f9aaac..436030383e1 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1046,7 +1046,7 @@ sub command_line_setup () {
   # 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 );
+  $sockdir = tempdir(CLEANUP => 0) if ( length($sockdir) > 80 );
 
   # Put this into a hash, will be a C struct