diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-17 13:30:01 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-17 13:30:01 -0500 |
| commit | 9bca6ffa4135e3a58c062a46eae096bccdd8113c (patch) | |
| tree | 297842daa86fb9c33b03d06983b795392cfb617a | |
| parent | c2e7e10c3221c1a8c1e289d75252d9cfc85074ac (diff) | |
| parent | 74fa02e80cae99c6d6dc410f97f9a0e463dd1290 (diff) | |
| download | mariadb-git-9bca6ffa4135e3a58c062a46eae096bccdd8113c.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-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 07d8e71b0e4..db1a016ec67 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 951d894c5b6..eb205a2ac2f 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -30,3 +30,4 @@ 4554b3722d71SbPiI2Gx-RhbZjmuIQ 4558b3d73Cxjlb7Wv1oytdSTthxDfw 45771031yRCoM_ZfONdYchPvVEgLRg +45ae6628gqKTsUFfnoNExadETVIkbA |