diff options
| author | kent@mysql.com <> | 2005-05-15 20:38:54 +0200 |
|---|---|---|
| committer | kent@mysql.com <> | 2005-05-15 20:38:54 +0200 |
| commit | 6374bfeb61119f290bba5c3349a81651309ef124 (patch) | |
| tree | 5e9d8f6049f977776bdfa769f1b246e2d0bce78e /client/mysqltest.c | |
| parent | 81b36addc966474dde3b66c86f90009a989f818e (diff) | |
| download | mariadb-git-6374bfeb61119f290bba5c3349a81651309ef124.tar.gz | |
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
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 362b6a0b1df..1f95f1eaeeb 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -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; |