1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge tag 'mariadb-10.0.17' into 10.0-galera

Conflicts:
	storage/innobase/include/trx0trx.h
This commit is contained in:
Nirbhay Choubey
2015-02-27 17:36:54 -05:00
584 changed files with 50432 additions and 8938 deletions

View File

@ -1506,7 +1506,12 @@ sub command_line_setup {
{
$default_vardir= "$glob_mysql_test_dir/var";
}
$default_vardir = realpath $default_vardir unless IS_WINDOWS;
unless (IS_WINDOWS) {
my $realpath = realpath($default_vardir);
die "realpath('$default_vardir') failed: $!\n"
unless defined($realpath) && $realpath ne '';
$default_vardir = $realpath;
}
if ( ! $opt_vardir )
{