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

Bug #11759877 52223: TEST "PLUGIN_DIR_BASIC" DOES NOT SUPPORT RPM BUILD (TEST) DIRECTORY STRUC

Browse Source 
Undo previous fix, it is not reliable
  Drop setting $MYSQL_LIBDIR, mtr can't be sure anyway
  Test is set to override plugin-dir to some known existing dir
This commit is contained in:
Bjorn Munch
2011-08-16 11:08:10 +02:00
parent b0751e9395
commit 41859de621
5 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/mysqld--help.inc
View File

@ -26,7 +26,7 @@ perl;
# And substitute the content some environment variables with their # And substitute the content some environment variables with their
# names: # names:
@env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_CHARSETSDIR MYSQL_SHAREDIR/; @env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_CHARSETSDIR MYSQL_SHAREDIR/;
$re1=join('|', @skipvars, @plugins); $re1=join('|', @skipvars, @plugins);
$re2=join('|', @plugins); $re2=join('|', @plugins);

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

@ -2295,12 +2295,6 @@ sub environment_setup {
$ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'port'}; $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'port'};
$ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir; $ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir;
$ENV{'MYSQLTEST_VARDIR'}= $opt_vardir; $ENV{'MYSQLTEST_VARDIR'}= $opt_vardir;
# Used for guessing default plugin dir, we can't really know for sure
$ENV{'MYSQL_LIBDIR'}= "$basedir/lib";
# Override if this does not exist, but lib64 does (best effort)
if (! -d "$basedir/lib" && -d "$basedir/lib64") {
$ENV{'MYSQL_LIBDIR'}= "$basedir/lib64";
}
$ENV{'MYSQL_BINDIR'}= "$bindir"; $ENV{'MYSQL_BINDIR'}= "$bindir";
$ENV{'MYSQL_SHAREDIR'}= $path_language; $ENV{'MYSQL_SHAREDIR'}= $path_language;
$ENV{'MYSQL_CHARSETSDIR'}= $path_charsetsdir; $ENV{'MYSQL_CHARSETSDIR'}= $path_charsetsdir;

10
mysql-test/suite/sys_vars/r/plugin_dir_basic.result
View File

@ -1,20 +1,20 @@
select @@global.plugin_dir; select @@global.plugin_dir;
@@global.plugin_dir @@global.plugin_dir
MYSQL_LIBDIR/plugin MYSQL_TMP_DIR
select @@session.plugin_dir; select @@session.plugin_dir;
ERROR HY000: Variable 'plugin_dir' is a GLOBAL variable ERROR HY000: Variable 'plugin_dir' is a GLOBAL variable
show global variables like 'plugin_dir'; show global variables like 'plugin_dir';
Variable_name Value Variable_name Value
plugin_dir MYSQL_LIBDIR/plugin plugin_dir MYSQL_TMP_DIR
show session variables like 'plugin_dir'; show session variables like 'plugin_dir';
Variable_name Value Variable_name Value
plugin_dir MYSQL_LIBDIR/plugin plugin_dir MYSQL_TMP_DIR
select * from information_schema.global_variables where variable_name='plugin_dir'; select * from information_schema.global_variables where variable_name='plugin_dir';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
PLUGIN_DIR MYSQL_LIBDIR/plugin PLUGIN_DIR MYSQL_TMP_DIR
select * from information_schema.session_variables where variable_name='plugin_dir'; select * from information_schema.session_variables where variable_name='plugin_dir';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
PLUGIN_DIR MYSQL_LIBDIR/plugin PLUGIN_DIR MYSQL_TMP_DIR
set global plugin_dir=1; set global plugin_dir=1;
ERROR HY000: Variable 'plugin_dir' is a read only variable ERROR HY000: Variable 'plugin_dir' is a read only variable
set session plugin_dir=1; set session plugin_dir=1;

1
mysql-test/suite/sys_vars/t/plugin_dir_basic-master.opt Normal file
View File

@ -0,0 +1 @@
--plugin-dir=$MYSQL_TMP_DIR

14
mysql-test/suite/sys_vars/t/plugin_dir_basic.test
View File

@ -3,20 +3,20 @@
# #
# #
# on windows it's <basedir>/lib/plugin # Don't rely on being able to guess the correct default.
# on unix it's <basedir>/lib/mysql/plugin # -master.opt file for this test sets plugin_dir to a known directory
# #
--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR /mysql/ /
select @@global.plugin_dir; select @@global.plugin_dir;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR --error ER_INCORRECT_GLOBAL_LOCAL_VAR
select @@session.plugin_dir; select @@session.plugin_dir;
--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR /mysql/ /
show global variables like 'plugin_dir'; show global variables like 'plugin_dir';
--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR /mysql/ /
show session variables like 'plugin_dir'; show session variables like 'plugin_dir';
--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR /mysql/ /
select * from information_schema.global_variables where variable_name='plugin_dir'; select * from information_schema.global_variables where variable_name='plugin_dir';
--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR /mysql/ /
select * from information_schema.session_variables where variable_name='plugin_dir'; select * from information_schema.session_variables where variable_name='plugin_dir';
# #