mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Fix for
Bug#35335 funcs_1: Some tests fail within load_file during pushbuild runs Solution: 1. Move files with input data used in load_file, load data etc. from suite/funcs_1/<whatever> to std_data 2. Use for testsuite funcs_1 the server option --secure-file-priv=<MYSQLTEST_VARDIR> 3. Outfiles have to be stored under MYSQLTEST_VARDIR + changes according to WL#4304 Cleanup in funcs_1 tests - backport of fixes/improvements made in 5.1 to 5.0 The differences between scripts in 5.0 and 5.1 cause much additional and annoying work during any upmerge. - replace error numbers with names - improved comments - improved formatting - Unify storage engine names so that result files for storage engine variants do not differ (some tests) - remove a script no more used (tests are done in other scripts)
This commit is contained in:
@ -3739,9 +3739,9 @@ sub mysqld_arguments ($$$$) {
|
||||
{
|
||||
# By default, prevent the started mysqld to access files outside of vardir
|
||||
my $secure_file_dir= $opt_vardir;
|
||||
if ( $opt_suite ne "main" )
|
||||
if ( $opt_suite ne "main" and $opt_suite ne "funcs_1" )
|
||||
{
|
||||
# When running a suite other than default allow the mysqld
|
||||
# When running a suite other than default or funcs_1 allow the mysqld
|
||||
# access to subdirs of mysql-test/ in order to make it possible
|
||||
# to "load data" from the suites data/ directory.
|
||||
$secure_file_dir= $glob_mysql_test_dir;
|
||||
|
Reference in New Issue
Block a user