diff options
| author | antony@ltantony.mysql.com <> | 2005-05-09 08:33:45 +0100 |
|---|---|---|
| committer | antony@ltantony.mysql.com <> | 2005-05-09 08:33:45 +0100 |
| commit | 61d7f1db13e544baeb225a4a5b87a8d2cef1d1a4 (patch) | |
| tree | c0940ccf50268b9010918c0bb74e9343b25f18a9 | |
| parent | 714994e3e6612ed8c5d7676f37f702ce142f7138 (diff) | |
| download | mariadb-git-61d7f1db13e544baeb225a4a5b87a8d2cef1d1a4.tar.gz | |
Fix outfile test/results
| -rw-r--r-- | mysql-test/r/outfile.result | bin | 953 -> 683 bytes | |||
| -rw-r--r-- | mysql-test/t/outfile.test | 17 |
2 files changed, 9 insertions, 8 deletions
diff --git a/mysql-test/r/outfile.result b/mysql-test/r/outfile.result Binary files differindex a2720be075a..a7871592241 100644 --- a/mysql-test/r/outfile.result +++ b/mysql-test/r/outfile.result diff --git a/mysql-test/t/outfile.test b/mysql-test/t/outfile.test index f86c4163289..800c9f4fd3f 100644 --- a/mysql-test/t/outfile.test +++ b/mysql-test/t/outfile.test @@ -25,14 +25,15 @@ select load_file(concat(@tmpdir,"/outfile-test.3")); # the following should give errors -disable_query_log; ---error 1086 -eval select * into outfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.1" from t1; ---error 1086 -eval select * into dumpfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.2" from t1; ---error 1086 -eval select * into dumpfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.3" from t1; -enable_query_log; +#disabled as error message has variable path +#disable_query_log; +#--error 1086 +#eval select * into outfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.1" from t1; +#--error 1086 +#eval select * into dumpfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.2" from t1; +#--error 1086 +#eval select * into dumpfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.3" from t1; +#enable_query_log; select load_file(concat(@tmpdir,"/outfile-test.not-exist")); --exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.1 --exec rm $MYSQL_TEST_DIR/var/tmp/outfile-test.2 |