summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2006-02-10 18:07:14 +0100
committerunknown <joerg@mysql.com>2006-02-10 18:07:14 +0100
commitcae77087f1bc8fb5d72b8d1d4e6f6795ea38cbd2 (patch)
treec6d005d0bd6af9704d76988b4b170e40b7613fa4 /support-files
parentf220f892124878c8ef202b847f292f7f05d83d2e (diff)
parentb4d38aa0c66a1c3f83f61e35e007c3a6f03185a9 (diff)
downloadmariadb-git-cae77087f1bc8fb5d72b8d1d4e6f6795ea38cbd2.tar.gz
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.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 912c6f9e051..613045e6ad5 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -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