Bug #53261 MTR tests archive_plugin and blackhole_plugin fail when compiling with cmake
Let mtr lookup the plugins, rather than hard-coding autotools lib path.
This commit is contained in:
parent
b985f88460
commit
407da94893
3
mysql-test/include/not_parallel.inc
Normal file
3
mysql-test/include/not_parallel.inc
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
if (`SELECT '$MTR_PARALLEL' > 1`) {
|
||||||
|
--skip test requires --parallel=1
|
||||||
|
}
|
@ -362,6 +362,7 @@ sub main {
|
|||||||
$opt_parallel= 1 if ($opt_parallel < 1);
|
$opt_parallel= 1 if ($opt_parallel < 1);
|
||||||
mtr_report("Using parallel: $opt_parallel");
|
mtr_report("Using parallel: $opt_parallel");
|
||||||
}
|
}
|
||||||
|
$ENV{MTR_PARALLEL} = $opt_parallel;
|
||||||
|
|
||||||
# Create server socket on any free port
|
# Create server socket on any free port
|
||||||
my $server = new IO::Socket::INET
|
my $server = new IO::Socket::INET
|
||||||
@ -1826,7 +1827,7 @@ sub find_plugin($$)
|
|||||||
mtr_file_exists(vs_config_dirs($location,$plugin_filename),
|
mtr_file_exists(vs_config_dirs($location,$plugin_filename),
|
||||||
"$basedir/lib/plugin/".$plugin_filename,
|
"$basedir/lib/plugin/".$plugin_filename,
|
||||||
"$basedir/$location/.libs/".$plugin_filename,
|
"$basedir/$location/.libs/".$plugin_filename,
|
||||||
"$basedir/lib/mysql/plugin/".$plugin_filename,
|
"$basedir/lib/mysql/plugin/".$plugin_filename,
|
||||||
);
|
);
|
||||||
return $lib_example_plugin;
|
return $lib_example_plugin;
|
||||||
}
|
}
|
||||||
@ -1943,6 +1944,16 @@ sub environment_setup {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# ----------------------------------------------------
|
||||||
|
# Add the paths where mysqld will find archive/blackhole/federated plugins.
|
||||||
|
# ----------------------------------------------------
|
||||||
|
$ENV{'ARCHIVE_PLUGIN_DIR'} =
|
||||||
|
dirname(find_plugin("ha_archive", "storage/archive"));
|
||||||
|
$ENV{'BLACKHOLE_PLUGIN_DIR'} =
|
||||||
|
dirname(find_plugin("ha_blackhole", "storage/blackhole"));
|
||||||
|
$ENV{'FEDERATED_PLUGIN_DIR'} =
|
||||||
|
dirname(find_plugin("ha_federated", "storage/federated"));
|
||||||
|
|
||||||
# ----------------------------------------------------
|
# ----------------------------------------------------
|
||||||
# Add the path where mysqld will find mypluglib.so
|
# Add the path where mysqld will find mypluglib.so
|
||||||
# ----------------------------------------------------
|
# ----------------------------------------------------
|
||||||
|
@ -1,2 +1 @@
|
|||||||
--plugin_dir=../storage/federated/.libs
|
--plugin_dir=$FEDERATED_PLUGIN_DIR
|
||||||
|
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
--source include/not_windows.inc
|
--source include/not_windows.inc
|
||||||
--source include/have_federated_plugin.inc
|
--source include/have_federated_plugin.inc
|
||||||
|
|
||||||
|
--skip federated plugin is disabled
|
||||||
|
|
||||||
CREATE TABLE t1(a int) ENGINE=FEDERATED;
|
CREATE TABLE t1(a int) ENGINE=FEDERATED;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
--plugin_dir=../storage/archive/.libs
|
--plugin_dir=$ARCHIVE_PLUGIN_DIR
|
||||||
|
@ -1,6 +1,10 @@
|
|||||||
--source include/not_windows.inc
|
--source include/not_windows.inc
|
||||||
--source include/have_archive_plugin.inc
|
--source include/have_archive_plugin.inc
|
||||||
|
|
||||||
|
# When running in parallel we get
|
||||||
|
# Warning 1620 Plugin is busy and will be uninstalled on shutdown
|
||||||
|
--source include/not_parallel.inc
|
||||||
|
|
||||||
CREATE TABLE t1(a int) ENGINE=ARCHIVE;
|
CREATE TABLE t1(a int) ENGINE=ARCHIVE;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
--plugin_dir=../storage/blackhole/.libs
|
--plugin_dir=$BLACKHOLE_PLUGIN_DIR
|
||||||
|
@ -1,6 +1,10 @@
|
|||||||
--source include/not_windows.inc
|
--source include/not_windows.inc
|
||||||
--source include/have_blackhole_plugin.inc
|
--source include/have_blackhole_plugin.inc
|
||||||
|
|
||||||
|
# When running in parallel we get
|
||||||
|
# Warning 1620 Plugin is busy and will be uninstalled on shutdown
|
||||||
|
--source include/not_parallel.inc
|
||||||
|
|
||||||
CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
|
CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user