summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <akishkin@work.mysql.com>2002-05-17 07:09:09 +0200
committerunknown <akishkin@work.mysql.com>2002-05-17 07:09:09 +0200
commit9768df9c6e960bad786d0043f4bf83ed0a7a7b9c (patch)
tree64153721a12acd6e3b62a6fc135293f3d6242f92
parentcf8433e4fe84b068d4e573eef9e0c01e6208b8cd (diff)
parent021a704aac06d69dfa496b178b6a20eaf0922d60 (diff)
downloadmariadb-git-9768df9c6e960bad786d0043f4bf83ed0a7a7b9c.tar.gz
Merge work.mysql.com:/home/bk/mysql-4.0
into work.mysql.com:/home/akishkin/mysql-4.0 BitKeeper/etc/logging_ok: auto-union
-rwxr-xr-xBUILD/compile-pentium-gcov3
-rw-r--r--BitKeeper/etc/logging_ok1
2 files changed, 3 insertions, 1 deletions
diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov
index 873d1d0d8e8..05cb0bb0d78 100755
--- a/BUILD/compile-pentium-gcov
+++ b/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"
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 44e038470d5..2a56cf6aa88 100644
--- a/BitKeeper/etc/logging_ok
+++ b/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