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

fix the plugin suite to pass

Browse Source
This commit is contained in:
Sergei Golubchik
2016-09-12 17:47:06 +02:00
parent 1fc49d3d1a
commit 365f199d2f
2 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2144,35 +2144,6 @@ sub have_maria_support () {
return defined $maria_var; return defined $maria_var;
} }
#
# Set environment to be used by childs of this process for
# things that are constant during the whole lifetime of mysql-test-run
#
sub find_plugin($$)
{
my ($plugin, $location) = @_;
my $plugin_filename;
if (IS_WINDOWS)
{
$plugin_filename = $plugin.".dll";
}
else
{
$plugin_filename = $plugin.".so";
}
my $lib_plugin=
mtr_file_exists(vs_config_dirs($location,$plugin_filename),
"$basedir/lib/plugin/".$plugin_filename,
"$basedir/lib64/plugin/".$plugin_filename,
"$basedir/$location/.libs/".$plugin_filename,
"$basedir/lib/mysql/plugin/".$plugin_filename,
"$basedir/lib64/mysql/plugin/".$plugin_filename,
);
return $lib_plugin;
}
sub environment_setup { sub environment_setup {
@ -2594,6 +2565,7 @@ sub setup_vardir() {
{ {
for (<$bindir/storage/*$opt_vs_config/*.dll>, for (<$bindir/storage/*$opt_vs_config/*.dll>,
<$bindir/plugin/*$opt_vs_config/*.dll>, <$bindir/plugin/*$opt_vs_config/*.dll>,
<$bindir/libmariadb/plugins/*$opt_vs_config/*.dll>,
<$bindir/sql$opt_vs_config/*.dll>) <$bindir/sql$opt_vs_config/*.dll>)
{ {
my $pname=basename($_); my $pname=basename($_);
@ -2611,12 +2583,9 @@ sub setup_vardir() {
unlink "$plugindir/symlink_test"; unlink "$plugindir/symlink_test";
} }
for (<../storage/*/.libs/*.so>, for (<$bindir/storage/*/*.so>,
<../plugin/*/.libs/*.so>,
<../plugin/*/*/.libs/*.so>,
<../sql/.libs/*.so>,
<$bindir/storage/*/*.so>,
<$bindir/plugin/*/*.so>, <$bindir/plugin/*/*.so>,
<$bindir/libmariadb/plugins/*/*.so>,
<$bindir/sql/*.so>) <$bindir/sql/*.so>)
{ {
my $pname=basename($_); my $pname=basename($_);
@ -2638,6 +2607,8 @@ sub setup_vardir() {
# hm, what paths work for debs and for rpms ? # hm, what paths work for debs and for rpms ?
for (<$bindir/lib64/mysql/plugin/*.so>, for (<$bindir/lib64/mysql/plugin/*.so>,
<$bindir/lib/mysql/plugin/*.so>, <$bindir/lib/mysql/plugin/*.so>,
<$bindir/lib64/mariadb/plugin/*.so>,
<$bindir/lib/mariadb/plugin/*.so>,
<$bindir/lib/plugin/*.so>, # bintar <$bindir/lib/plugin/*.so>, # bintar
<$bindir/lib/plugin/*.dll>) <$bindir/lib/plugin/*.dll>)
{ {

2
mysql-test/suite/plugins/r/show_all_plugins.result
View File

@ -26,7 +26,7 @@ three_attempts NOT INSTALLED AUTHENTICATION dialog_examples.so GPL
two_questions NOT INSTALLED AUTHENTICATION dialog_examples.so GPL two_questions NOT INSTALLED AUTHENTICATION dialog_examples.so GPL
show status like '%libraries%'; show status like '%libraries%';
Variable_name Value Variable_name Value
Opened_plugin_libraries 7 Opened_plugin_libraries 8
show plugins soname where library = 'ha_example.so'; show plugins soname where library = 'ha_example.so';
Name Status Type Library License Name Status Type Library License
EXAMPLE NOT INSTALLED STORAGE ENGINE ha_example.so GPL EXAMPLE NOT INSTALLED STORAGE ENGINE ha_example.so GPL