diff options
| author | unknown <antony@ltantony.mysql.com> | 2005-05-08 01:20:47 +0100 |
|---|---|---|
| committer | unknown <antony@ltantony.mysql.com> | 2005-05-08 01:20:47 +0100 |
| commit | ff7676c39a798b6454fe58406fc5a9dc6d62ca3b (patch) | |
| tree | 2655abade8eeba5ea33ecced844be53429ed684d | |
| parent | 2a5b1316431eb8d1ae083d7a169a5e8f7e0c6418 (diff) | |
| parent | cf664e752b0238b595c3ed85715a5121aad688ad (diff) | |
| download | mariadb-git-ff7676c39a798b6454fe58406fc5a9dc6d62ca3b.tar.gz | |
Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0
BitKeeper/etc/logging_ok:
auto-union
| -rwxr-xr-x | BUILD/check-cpu | 12 | ||||
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index 553df39191f..ce106e5a603 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -19,6 +19,18 @@ if test -r /proc/cpuinfo ; then if test -z "$model_name" ; then model_name=`uname -m` fi +else + # Fallback when there is no /proc/cpuinfo + case "`uname -s`" in + FreeBSD) + cpu_family=`uname -m`; + model_name=`sysctl -b hw.model` + ;; + *) + cpu_family=`uname -m`; + model_name="unknown"; + ;; + esac fi case "$cpu_family--$model_name" in diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 101e845ccf1..6a17f69a0d8 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -15,6 +15,7 @@ ahlentz@co3064164-a.rochd1.qld.optusnet.com.au akishkin@work.mysql.com anjuta@arthur.local antony@ltantony.dsl-verizon.net +antony@ltantony.mysql.com antony@ltantony.rdg.cyberkinetica.com antony@ltantony.rdg.cyberkinetica.homeunix.net arjen@bitbike.com |