Merge work:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BUILD/compile-pentium

@@ -7,6 +7,6 @@ extra_flags="$pentium_cflags $fast_cflags"
 extra_configs="$pentium_configs"
 strip=yes
 
-extra_configs="$extra_configs --with-berkeley-db --with-innobase"
+extra_configs="$extra_configs"
 
 . "$path/FINISH.sh"

BUILD/compile-pentium-max

+#! /bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+extra_flags="$pentium_cflags $fast_cflags"
+extra_configs="$pentium_configs"
+strip=yes
+
+extra_configs="$extra_configs --with-innobase --with-berkeley-db"
+
+. "$path/FINISH.sh"

BitKeeper/etc/logging_ok

 heikki@donna.mysql.fi
+sasha@mysql.sashanet.com