Skip to content

Commit

Permalink
Merge remote-tracking branch 'openquery/MDEV-8060-shm-path' into 5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
vuvova committed Apr 27, 2015
2 parents 245cc73 + 574227c commit 939a233
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mysql-test/mysql-test-run.pl
Expand Up @@ -1462,7 +1462,7 @@ sub command_line_setup {
# Search through list of locations that are known
# to be "fast disks" to find a suitable location
# Use --mem=<dir> as first location to look.
my @tmpfs_locations= ($opt_mem, "/dev/shm", "/tmp");
my @tmpfs_locations= ($opt_mem,"/run/shm", "/dev/shm", "/tmp");

foreach my $fs (@tmpfs_locations)
{
Expand Down Expand Up @@ -6367,7 +6367,7 @@ ($)
mem Run testsuite in "memory" using tmpfs or ramdisk
Attempts to find a suitable location
using a builtin list of standard locations
for tmpfs (/dev/shm)
for tmpfs (/run/shm, /dev/shm, /tmp)
The option can also be set using environment
variable MTR_MEM=[DIR]
clean-vardir Clean vardir if tests were successful and if
Expand Down

0 comments on commit 939a233

Please sign in to comment.