diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-17 13:34:36 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-17 13:34:36 -0500 |
| commit | 3125781a8d3b42027e028f5dfcb7a2b032aeaf23 (patch) | |
| tree | 776847f67d363941ec6b2aed9f5488bd9271ab9f | |
| parent | b95f107371606a6771e28447750372e172513d95 (diff) | |
| parent | 63cb7acee22997ae19c169979316791f5777ba7d (diff) | |
| download | mariadb-git-3125781a8d3b42027e028f5dfcb7a2b032aeaf23.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
BUILD/check-cpu:
Auto merged
| -rwxr-xr-x | BUILD/check-cpu | 2 | ||||
| -rw-r--r-- | BitKeeper/etc/collapsed | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index 9dd10b8ec3e..35091c2b9de 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -28,7 +28,7 @@ check_cpu () { fi # parse CPU flags - for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //'`; do + for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //' -e 's/[^a-zA-Z0-9_ ]/_/g'`; do eval cpu_flag_$flag=yes done else diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 3b45bb4f30c..457d909ef74 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -3,3 +3,4 @@ 454f8960jsVT_kMKJtZ9OCgXoba0xQ 4554a95d7txO1DuO9G3nAizI3SkFAA 4554b3722d71SbPiI2Gx-RhbZjmuIQ +45ae6628gqKTsUFfnoNExadETVIkbA |