summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2006-07-10 11:42:45 +0200
committerunknown <joerg@trift2.>2006-07-10 11:42:45 +0200
commitcdd07074d7e4312186357f0e22b0a7c33ef2c928 (patch)
tree7487fccbe0e0d6a231fe502bacd544ecc25dd501 /support-files
parente6f010b63eb9d846810bff75352fa9aa5424426f (diff)
parent945d4606bba0c00c33fe5750bd612918e65be3c2 (diff)
downloadmariadb-git-cdd07074d7e4312186357f0e22b0a7c33ef2c928.tar.gz
Merge trift2.:/M50/clone-5.0
into trift2.:/M50/back23-5.0 support-files/mysql.spec.sh: Auto merged
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 493a37c040c..00fc1840e1c 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -342,7 +342,7 @@ then
cp -fp config.log "$MYSQL_MAXCONFLOG_DEST"
fi
-make -i test-force || true
+make -i test-force.pl || true
# Save mysqld-max
./libtool --mode=execute cp sql/mysqld sql/mysqld-max
@@ -401,7 +401,7 @@ then
cp -fp config.log "$MYSQL_CONFLOG_DEST"
fi
-make -i test-force || true
+make -i test-force.pl || true
%install
RBR=$RPM_BUILD_ROOT
@@ -740,6 +740,11 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
+* Tue Jul 04 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Use the Perl script to run the tests, because it will automatically check
+ whether the server is configured with SSL.
+
* Tue Jun 27 2006 Joerg Bruehe <joerg@mysql.com>
- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216)