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

mysqltest.c:

Browse Source 
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
This commit is contained in:
unknown
2005-05-15 20:38:54 +02:00
parent bea0e79f57
commit 8fd8d819d0
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysqltest.c
View File

@ -3522,6 +3522,12 @@ int main(int argc, char **argv)
if (q->query == q->query_buf) if (q->query == q->query_buf)
q->query += q->first_word_len + 1; q->query += q->first_word_len + 1;
display_result_vertically= (q->type==Q_QUERY_VERTICAL); 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); error|= run_query(&cur_con->mysql, q, QUERY_REAP|QUERY_SEND);
display_result_vertically= old_display_result_vertically; display_result_vertically= old_display_result_vertically;
break; break;

10
mysql-test/mysql-test-run.pl
View File

@ -1019,6 +1019,11 @@ sub kill_and_cleanup () {
mtr_report("Removing Stale Files"); 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/log");
rmtree("$opt_vardir/ndbcluster-$opt_ndbcluster_port"); rmtree("$opt_vardir/ndbcluster-$opt_ndbcluster_port");
rmtree("$opt_vardir/run"); rmtree("$opt_vardir/run");
@ -1027,10 +1032,7 @@ sub kill_and_cleanup () {
mkpath("$opt_vardir/log"); mkpath("$opt_vardir/log");
mkpath("$opt_vardir/run"); mkpath("$opt_vardir/run");
mkpath("$opt_vardir/tmp"); mkpath("$opt_vardir/tmp");
if ( $opt_tmpdir ne "$opt_vardir/tmp" ) mkpath($opt_tmpdir) if $opt_tmpdir ne "$opt_vardir/tmp";
{
mkpath($opt_tmpdir);
}
# FIXME do we really need to create these all, or are they # FIXME do we really need to create these all, or are they
# created for us when tables are created? # created for us when tables are created?