Commit cae77087 authored by unknown's avatar unknown
Browse files

support-files/mysql.spec.sh : Manual merge: new "-i" in "make -i test-force", changelog.


support-files/mysql.spec.sh:
  Manual merge: new "-i" in "make -i test-force", changelog.
parents f220f892 b4d38aa0
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ then
  cp -fp config.log "$MYSQL_MAXCONFLOG_DEST"
fi

make test-force || true
make -i test-force || true

# Save mysqld-max
# check if mysqld was installed in .libs/
@@ -389,7 +389,7 @@ then
  cp -fp config.log "$MYSQL_CONFLOG_DEST"
fi

make test-force || true
make -i test-force || true

%install
RBR=$RPM_BUILD_ROOT
@@ -720,6 +720,11 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%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>

- Added zlib to the list of (static) libraries installed