Commit 09f511eb authored by unknown's avatar unknown

Merge mysql.com:/space/my/mysql-5.0-build

into mysql.com:/space/my/mysql-5.0


Build-tools/Do-compile:
  Auto merged
parents 8580b2d9 b8cd76af
...@@ -1535,12 +1535,12 @@ run_testcase () ...@@ -1535,12 +1535,12 @@ run_testcase ()
return return
fi fi
if [ -f "$TESTDIR/$tname.disabled" ] # if [ -f "$TESTDIR/$tname.disabled" ]
then # then
comment=`$CAT $TESTDIR/$tname.disabled`; # comment=`$CAT $TESTDIR/$tname.disabled`;
disable_test $tname "$comment" # disable_test $tname "$comment"
return # return
fi # fi
if [ -f "$TESTDIR/disabled.def" ] ; then if [ -f "$TESTDIR/disabled.def" ] ; then
comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`; comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;
if [ -n "$comment" ] if [ -n "$comment" ]
......
...@@ -214,7 +214,6 @@ Optional MySQL server binary that supports additional features like: ...@@ -214,7 +214,6 @@ Optional MySQL server binary that supports additional features like:
- CSV Storage Engine - CSV Storage Engine
- Example Storage Engine - Example Storage Engine
- Federated Storage Engine - Federated Storage Engine
- MyISAM RAID
- User Defined Functions (UDFs). - User Defined Functions (UDFs).
To activate this binary, just install this package in addition to To activate this binary, just install this package in addition to
...@@ -328,7 +327,6 @@ BuildMySQL "--enable-shared \ ...@@ -328,7 +327,6 @@ BuildMySQL "--enable-shared \
--with-berkeley-db \ --with-berkeley-db \
--with-innodb \ --with-innodb \
--with-ndbcluster \ --with-ndbcluster \
--with-raid \
--with-archive \ --with-archive \
--with-csv-storage-engine \ --with-csv-storage-engine \
--with-example-storage-engine \ --with-example-storage-engine \
...@@ -694,9 +692,14 @@ fi ...@@ -694,9 +692,14 @@ 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 Mar 18 2005 Lenz Grimmer <lenz@mysql.com>
- Disabled RAID in the Max binares once and for all (it has finally been removed
from the source tree)
* Sun Feb 20 2005 Petr Chardin <petr@mysql.com> * Sun Feb 20 2005 Petr Chardin <petr@mysql.com>
- Install MySQL Instance Manager together with mysqld, toch mysqlmanager - Install MySQL Instance Manager together with mysqld, touch mysqlmanager
password file password file
* Mon Feb 14 2005 Lenz Grimmer <lenz@mysql.com> * Mon Feb 14 2005 Lenz Grimmer <lenz@mysql.com>
......
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