Commit 039f806a authored by unknown's avatar unknown
Browse files

Add warnings and more error checks in the creation of vardirs

parent dc48e348

mysql-test/mysql-test-run.pl

+14 −5
Original line number Diff line number Diff line
@@ -1915,20 +1915,25 @@ sub remove_stale_vardir () { 
    if ( -l $opt_vardir)

    {

      # var is a symlink

      if ( readlink($opt_vardir) eq $opt_mem )



      if ( $opt_mem and readlink($opt_vardir) eq $opt_mem )

      {

	# Remove the directory which the link points at

	mtr_verbose("Removing " . readlink($opt_vardir));

	rmtree(readlink($opt_vardir));



	# Remove the entire "var" dir

	mtr_verbose("Removing $opt_vardir/");

	rmtree("$opt_vardir/");



	# Remove the "var" symlink

	mtr_verbose("unlink($opt_vardir)");

	unlink($opt_vardir);

      }

      elsif ( $opt_mem )

      {

	# Just remove the "var" symlink

	mtr_report("WARNING: Removing '$opt_vardir' symlink it's wrong");



	mtr_verbose("unlink($opt_vardir)");

	unlink($opt_vardir);

      }

      else

      {

	# Some users creates a soft link in mysql-test/var to another area
@@ -1936,6 +1941,10 @@ sub remove_stale_vardir () { 


	mtr_report("WARNING: Using the 'mysql-test/var' symlink");



	# Make sure the directory where it points exist

	mtr_error("The destination for symlink $opt_vardir does not exist")

	  if ! -d readlink($opt_vardir);



	my $dir=       shift;

	foreach my $bin ( glob("$opt_vardir/*") )

	{