diff options
| author | unknown <tonu@volk.internalnet> | 2001-09-30 10:47:32 +0800 |
|---|---|---|
| committer | unknown <tonu@volk.internalnet> | 2001-09-30 10:47:32 +0800 |
| commit | 6e8704ee0993b4f06d1c3626291346d20c6d60cb (patch) | |
| tree | 23320c30b5375f656671ecf64934369738776dda /acinclude.m4 | |
| parent | ad9c7236a026395e5d7e6faf7ec83689f631ca40 (diff) | |
| parent | d13f2dfdeb2b23c6abfb608885e8717878122a7b (diff) | |
| download | mariadb-git-6e8704ee0993b4f06d1c3626291346d20c6d60cb.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0
acinclude.m4:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/structs.h:
Auto merged
Docs/manual.texi:
Auto merged
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 0a767227ce4..1535f0df5f7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -663,7 +663,7 @@ if test "$cpu_vendor" = "AuthenticAMD"; then fi elif test "$cpu_vendor" = "GenuineIntel"; then if test $cpu_family>=6; then - cpu_set=" pentiumpro pentium i486 i386"; + cpu_set="pentiumpro pentium i486 i386"; elif test $cpu_family=5; then cpu_set="pentium i486 i386"; elif test $cpu_family=4; then @@ -682,9 +682,9 @@ done if test "$mysql_cv_cpu" = "unknown" then CFLAGS="$ac_save_CFLAGS" - AC_MSG_RESULT(none) + AC_MSG_RESULT(none) else - AC_MSG_RESULT($mysql_cv_cpu) + AC_MSG_RESULT($mysql_cv_cpu) fi ])) |