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

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


BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged

BitKeeper/etc/logging_ok

@@ -1,3 +1,4 @@
 jani@prima.mysql.com
 sasha@mysql.sashanet.com
+sasha@work.mysql.com
 serg@serg.mysql.com

Build-tools/Do-all-build-steps

@@ -58,7 +58,8 @@ aclocal; autoheader; aclocal; automake; autoconf
  --with-unix-socket-path=/var/tmp/mysql.sock \
  --with-low-memory \
  --with-mit-threads=yes $EXTRA_CONFIG \
- --enable-thread-safe-client
+ --enable-thread-safe-client \
+ --without-berkeley-db
 
 gmake -j 2 # --jobs=4 does not work.