Commit 8fd8d819 authored by unknown's avatar unknown
Browse files

mysqltest.c: 

  To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory


mysql-test/mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory
client/mysqltest.c:
  To solve bug#6193, also reset require when using 'eval' for running query
parent bea0e79f

client/mysqltest.c

+6 −0
Original line number Diff line number Diff line
@@ -3522,6 +3522,12 @@ int main(int argc, char **argv) 
	if (q->query == q->query_buf)

	  q->query += q->first_word_len + 1;

	display_result_vertically= (q->type==Q_QUERY_VERTICAL);

	if (save_file[0])

	{

	  strmov(q->record_file,save_file);

	  q->require_file=require_file;

	  save_file[0]=0;

	}

	error|= run_query(&cur_con->mysql, q, QUERY_REAP|QUERY_SEND);

	display_result_vertically= old_display_result_vertically;

	break;

mysql-test/mysql-test-run.pl

+6 −4
Original line number Diff line number Diff line
@@ -1019,6 +1019,11 @@ sub kill_and_cleanup () { 


  mtr_report("Removing Stale Files");



  if ( -l $opt_vardir and ! unlink($opt_vardir) )

  {

    mtr_error("Can't remove soft link \"$opt_vardir\"");

  }



  rmtree("$opt_vardir/log");

  rmtree("$opt_vardir/ndbcluster-$opt_ndbcluster_port");

  rmtree("$opt_vardir/run");
@@ -1027,10 +1032,7 @@ sub kill_and_cleanup () { 
  mkpath("$opt_vardir/log");

  mkpath("$opt_vardir/run");

  mkpath("$opt_vardir/tmp");

  if ( $opt_tmpdir ne "$opt_vardir/tmp" )

  {

    mkpath($opt_tmpdir);

  }

  mkpath($opt_tmpdir) if $opt_tmpdir ne "$opt_vardir/tmp";



  # FIXME do we really need to create these all, or are they

  # created for us when tables are created?