database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

merge with 5.1

Browse Source
This commit is contained in:
Sergei Golubchik
2010-10-25 15:21:16 +02:00
parent 37a78d6868 60c15066db
commit 04a4b43346
230 changed files with 4615 additions and 1320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/lib/mtr_cases.pm
View File

@ -252,15 +252,11 @@ sub collect_one_suite
}
else
{
$suitedir= my_find_dir($::basedir,
["mysql-test/suite",
"mysql-test",
"share/mysql-test/suite",
"share/mysql-test",
"share/mysql/mysql-test/suite",
"share/mysql/mysql-test",
$suitedir= my_find_dir($suitedir,
["suite",
".",
# Look in storage engine specific suite dirs
"storage/*/mysql-test-suites"
"../storage/*/mysql-test-suites"
],
[$suite]);
}
@ -573,7 +569,7 @@ sub optimize_cases {
# Check that engine selected by
# --default-storage-engine=<engine> is supported
# =======================================================
my %builtin_engines = ('myisam' => 1, 'memory' => 1);
my %builtin_engines = ('myisam' => 1, 'memory' => 1, 'csv' => 1);
foreach my $opt ( @{$tinfo->{master_opt}} ) {
my $default_engine=