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

merge 5.1-security => 5.5-security

Browse Source
This commit is contained in:
Kristofer Pettersson
2010-12-16 15:08:26 +01:00
parent 802fdecbfc 21da523f17
commit 8597a8b866
5 changed files with 82 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2186,6 +2186,16 @@ sub environment_setup {
$ENV{'MYSQL_LIBDIR'}= "$basedir/lib";
$ENV{'MYSQL_SHAREDIR'}= $path_language;
$ENV{'MYSQL_CHARSETSDIR'}= $path_charsetsdir;
if (IS_WINDOWS)
{
$ENV{'SECURE_LOAD_PATH'}= $glob_mysql_test_dir."\\std_data";
}
else
{
$ENV{'SECURE_LOAD_PATH'}= $glob_mysql_test_dir."/std_data";
}
# ----------------------------------------------------
# Setup env for NDB