mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into mysql.com:/space/my/mysql-5.0
This commit is contained in:
lenz@mysql.com 2005-03-18 17:32:57 +01:00
commit 63b078c53f
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mysql-test/mysql-test-run.sh
View file

@ -1535,12 +1535,12 @@ run_testcase ()
return
fi
if [ -f "$TESTDIR/$tname.disabled" ]
then
comment=`$CAT $TESTDIR/$tname.disabled`;
disable_test $tname "$comment"
return
fi
# if [ -f "$TESTDIR/$tname.disabled" ]
# then
# comment=`$CAT $TESTDIR/$tname.disabled`;
# disable_test $tname "$comment"
# return
# fi
if [ -f "$TESTDIR/disabled.def" ] ; then
comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;
if [ -n "$comment" ]

9
support-files/mysql.spec.sh
View file

@ -214,7 +214,6 @@ Optional MySQL server binary that supports additional features like:
- CSV Storage Engine
- Example Storage Engine
- Federated Storage Engine
- MyISAM RAID
- User Defined Functions (UDFs).
To activate this binary, just install this package in addition to
@ -328,7 +327,6 @@ BuildMySQL "--enable-shared \
--with-berkeley-db \
--with-innodb \
--with-ndbcluster \
--with-raid \
--with-archive \
--with-csv-storage-engine \
--with-example-storage-engine \
@ -694,9 +692,14 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%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>
- Install MySQL Instance Manager together with mysqld, toch mysqlmanager
- Install MySQL Instance Manager together with mysqld, touch mysqlmanager
password file
* Mon Feb 14 2005 Lenz Grimmer <lenz@mysql.com>