diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-12-07 10:23:17 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-12-07 10:23:17 -0700 |
| commit | 47d7fe9e385664ce4f13751d79da7aac43119708 (patch) | |
| tree | acf1cc45829e15c6611747ba633f743a13ae0af4 | |
| parent | 4b262c5dafca5082376f412628ff056240c3ebe6 (diff) | |
| parent | 9ae7f931ce2e0c6894d48ea1eaba10e43f122718 (diff) | |
| download | mariadb-git-47d7fe9e385664ce4f13751d79da7aac43119708.tar.gz | |
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
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rwxr-xr-x | Build-tools/Do-all-build-steps | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index fd4f869760d..ce14b65fb96 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,3 +1,4 @@ jani@prima.mysql.com sasha@mysql.sashanet.com +sasha@work.mysql.com serg@serg.mysql.com diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps index 8c2be1844a0..ba6b93672ed 100755 --- a/Build-tools/Do-all-build-steps +++ b/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. |