Merge work.mysql.com:/home/bk/mysql-4.0

into work.mysql.com:/home/akishkin/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union

BUILD/compile-pentium-gcov

@@ -3,7 +3,8 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags -O2 -fprofile-arcs -ftest-coverage"
+extra_flags="$pentium_cflags  -fprofile-arcs -ftest-coverage"
 extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
+extra_configs="$extra_configs  --with-innodb --with-berkeley-db"
 
 . "$path/FINISH.sh"

BitKeeper/etc/logging_ok

@@ -4,6 +4,7 @@ Administrator@fred.
 Miguel@light.local
 Sinisa@sinisa.nasamreza.org
 ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
+akishkin@work.mysql.com
 arjen@co3064164-a.bitbike.com
 arjen@fred.bitbike.com
 arjen@george.bitbike.com