Commit 939a2334 authored by Sergei Golubchik's avatar Sergei Golubchik

Merge remote-tracking branch 'openquery/MDEV-8060-shm-path' into 5.5

parents 245cc734 574227c9
...@@ -1462,7 +1462,7 @@ sub command_line_setup { ...@@ -1462,7 +1462,7 @@ sub command_line_setup {
# Search through list of locations that are known # Search through list of locations that are known
# to be "fast disks" to find a suitable location # to be "fast disks" to find a suitable location
# Use --mem=<dir> as first location to look. # 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) foreach my $fs (@tmpfs_locations)
{ {
...@@ -6367,7 +6367,7 @@ Options to control directories to use ...@@ -6367,7 +6367,7 @@ Options to control directories to use
mem Run testsuite in "memory" using tmpfs or ramdisk mem Run testsuite in "memory" using tmpfs or ramdisk
Attempts to find a suitable location Attempts to find a suitable location
using a builtin list of standard locations 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 The option can also be set using environment
variable MTR_MEM=[DIR] variable MTR_MEM=[DIR]
clean-vardir Clean vardir if tests were successful and if clean-vardir Clean vardir if tests were successful and if
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment