Commit 47746b12 authored by joerg@mysql.com's avatar joerg@mysql.com

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/M50/rpmspec-5.0
parents d19e124d 49caf76e
...@@ -322,7 +322,7 @@ then ...@@ -322,7 +322,7 @@ then
cp -fp config.log "$MYSQL_MAXCONFLOG_DEST" cp -fp config.log "$MYSQL_MAXCONFLOG_DEST"
fi fi
make test-force || true make -i test-force || true
# Save mysqld-max # Save mysqld-max
# check if mysqld was installed in .libs/ # check if mysqld was installed in .libs/
...@@ -389,7 +389,7 @@ then ...@@ -389,7 +389,7 @@ then
cp -fp config.log "$MYSQL_CONFLOG_DEST" cp -fp config.log "$MYSQL_CONFLOG_DEST"
fi fi
make test-force || true make -i test-force || true
%install %install
RBR=$RPM_BUILD_ROOT RBR=$RPM_BUILD_ROOT
...@@ -720,6 +720,11 @@ fi ...@@ -720,6 +720,11 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* Fri Jan 10 2006 Joerg Bruehe <joerg@mysql.com>
- Use "-i" on "make test-force";
this is essential for later evaluation of this log file.
* Fri Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com> * Fri Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com>
- Added zlib to the list of (static) libraries installed - Added zlib to the list of (static) libraries installed
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment