Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721

into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-01-17 13:34:36 -05:00 · 2007-01-17 13:34:36 -05:00 · c9a0cccc23
commit c9a0cccc23
parent 29be5ce836 332f9ff8b4
2 changed files with 2 additions and 1 deletions
--- 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
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@ -3,3 +3,4 @@
 454f8960jsVT_kMKJtZ9OCgXoba0xQ
 4554a95d7txO1DuO9G3nAizI3SkFAA
 4554b3722d71SbPiI2Gx-RhbZjmuIQ
+45ae6628gqKTsUFfnoNExadETVIkbA