diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-17 13:24:20 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-17 13:24:20 -0500 |
| commit | 11aba7336ff8706a9025ad513ab3e68d5535dcf4 (patch) | |
| tree | e487fce7ea1d116ffde1a46a78c18a65699f9291 | |
| parent | d175622bb7f1d4c585a9f4ce436c9f7dd4386b88 (diff) | |
| parent | 1f4ab7853e630894796a1819103b1fa87a0d6cc3 (diff) | |
| download | mariadb-git-11aba7336ff8706a9025ad513ab3e68d5535dcf4.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
Delete: BitKeeper/etc/collapsed
BUILD/check-cpu:
Auto merged
BitKeeper/etc/collapsed:
'Auto converge'
| -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 fb69fd0acae..d8c5b1be2ca 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 |