Commit a744ab78 authored by aelkin@mysql.com's avatar aelkin@mysql.com

Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
parents 0866e426 678e075e
...@@ -309,7 +309,7 @@ BuildMySQL "--enable-shared \ ...@@ -309,7 +309,7 @@ BuildMySQL "--enable-shared \
--with-comment=\"MySQL Community Edition - Max (GPL)\" \ --with-comment=\"MySQL Community Edition - Max (GPL)\" \
--with-server-suffix='-Max'" --with-server-suffix='-Max'"
make test-force || true make -i test-force || true
# Save mysqld-max # Save mysqld-max
mv sql/mysqld sql/mysqld-max mv sql/mysqld sql/mysqld-max
...@@ -363,7 +363,7 @@ BuildMySQL "--disable-shared \ ...@@ -363,7 +363,7 @@ BuildMySQL "--disable-shared \
--without-openssl" --without-openssl"
nm --numeric-sort sql/mysqld > sql/mysqld.sym nm --numeric-sort sql/mysqld > sql/mysqld.sym
make test-force || true make -i test-force || true
%install %install
RBR=$RPM_BUILD_ROOT RBR=$RPM_BUILD_ROOT
...@@ -689,6 +689,11 @@ fi ...@@ -689,6 +689,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.
* Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com> * Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
- Avoid using the "bundled" zlib on "shared" builds: - Avoid using the "bundled" zlib on "shared" builds:
......
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