Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
4a38d4d7
Commit
4a38d4d7
authored
16 years ago
by
Magnus Svensson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Patch for combinations file using different --default-storage-engine= directives
parent
c7de7ff0
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
6 deletions
+19
-6
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_cases.pm
+19
-6
No files found.
mysql-test/lib/mtr_cases.pm
View file @
4a38d4d7
...
...
@@ -537,23 +537,36 @@ sub optimize_cases {
}
}
# =======================================================
# Check that engine selected by
# --default-storage-engine=<engine> is supported
# =======================================================
my
%
builtin_engines
=
('
myisam
'
=>
1
,
'
memory
'
=>
1
);
foreach
my
$opt
(
@
{
$tinfo
->
{
master_opt
}}
)
{
my
$default_engine
=
mtr_match_prefix
(
$opt
,
"
--default-storage-engine=
");
if
(
defined
$default_engine
){
if
(
!
exists
$::mysqld_variables
{
$default_engine
}
)
{
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
comment
'}
=
"
'
$default_engine
' not supported
";
#print " $tinfo->{name}\n";
#print " - The test asked to use '$default_engine'\n";
#my $engine_value= $::mysqld_variables{$default_engine};
#print " - The mysqld_variables says '$engine_value'\n";
if
(
!
exists
$::mysqld_variables
{
$default_engine
}
and
!
exists
$builtin_engines
{
$default_engine
}
)
{
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
comment
'}
=
"
'
$default_engine
' not supported
";
}
$tinfo
->
{'
ndb_test
'}
=
1
if
(
$default_engine
=~
/^ndb/i
);
$tinfo
->
{'
innodb_test
'}
=
1
if
(
$default_engine
=~
/^innodb/i
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment