database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merging

Browse Source
This commit is contained in:
Alexey Botchkov
2009-09-29 18:28:01 +05:00
parent 227335784c 88365681af
commit 60eee477f4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -493,6 +493,7 @@ sub collect_one_suite($)
$lib_innodb_plugin) $lib_innodb_plugin)
{ {
my @new_cases; my @new_cases;
my $sep= (IS_WINDOWS) ? ';' : ':';
foreach my $test (@cases) foreach my $test (@cases)
{ {
@ -520,12 +521,13 @@ sub collect_one_suite($)
} }
} }
my $plugin_filename= basename($lib_innodb_plugin); my $plugin_filename= basename($lib_innodb_plugin);
my $plugin_list= "innodb=$plugin_filename" . $sep . "innodb_locks=$plugin_filename";
push(@{$new_test->{master_opt}}, '--ignore-builtin-innodb'); push(@{$new_test->{master_opt}}, '--ignore-builtin-innodb');
push(@{$new_test->{master_opt}}, '--plugin-dir=' . dirname($lib_innodb_plugin)); push(@{$new_test->{master_opt}}, '--plugin-dir=' . dirname($lib_innodb_plugin));
push(@{$new_test->{master_opt}}, "--plugin_load=innodb=$plugin_filename;innodb_locks=$plugin_filename"); push(@{$new_test->{master_opt}}, "--plugin_load=$plugin_list");
push(@{$new_test->{slave_opt}}, '--ignore-builtin-innodb'); push(@{$new_test->{slave_opt}}, '--ignore-builtin-innodb');
push(@{$new_test->{slave_opt}}, '--plugin-dir=' . dirname($lib_innodb_plugin)); push(@{$new_test->{slave_opt}}, '--plugin-dir=' . dirname($lib_innodb_plugin));
push(@{$new_test->{slave_opt}}, "--plugin_load=innodb=$plugin_filename;innodb_locks=$plugin_filename"); push(@{$new_test->{slave_opt}}, "--plugin_load=$plugin_list");
if ($new_test->{combination}) if ($new_test->{combination})
{ {
$new_test->{combination}.= ' + InnoDB plugin'; $new_test->{combination}.= ' + InnoDB plugin';

2
mysql-test/mysql-test-run.pl
View File

@ -1812,7 +1812,7 @@ sub environment_setup {
($lib_example_plugin ? dirname($lib_example_plugin) : ""); ($lib_example_plugin ? dirname($lib_example_plugin) : "");
$ENV{'HA_EXAMPLE_SO'}="'".$plugin_filename."'"; $ENV{'HA_EXAMPLE_SO'}="'".$plugin_filename."'";
$ENV{'EXAMPLE_PLUGIN_LOAD'}="--plugin_load=;EXAMPLE=".$plugin_filename.";"; $ENV{'EXAMPLE_PLUGIN_LOAD'}="--plugin_load=EXAMPLE=".$plugin_filename;
} }
# ---------------------------------------------------- # ----------------------------------------------------