summaryrefslogtreecommitdiff
path: root/mysql-test/t/outfile.test
diff options
context:
space:
mode:
authorPatrick Crews <patrick.crews@sun.com>2008-09-23 05:24:32 -0400
committerPatrick Crews <patrick.crews@sun.com>2008-09-23 05:24:32 -0400
commitf5c1c9af8eec83641b859749b690f83bcd1ee2bf (patch)
tree6a860c10e41d7328be6ebca6e210444f7d5eccd0 /mysql-test/t/outfile.test
parent404e4b802cc15197028f29a38f522e2711366c02 (diff)
parentfa490eb9334c00c3e64009829abfdc5e281b3740 (diff)
downloadmariadb-git-f5c1c9af8eec83641b859749b690f83bcd1ee2bf.tar.gz
Bug#38311 - Fix of some cruft from remove_files in ndb_autodiscover.test, clean up of distinct.test,
and replacing error numbers with error names.
Diffstat (limited to 'mysql-test/t/outfile.test')
-rw-r--r--mysql-test/t/outfile.test10
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/outfile.test b/mysql-test/t/outfile.test
index 941bbe228d4..527a4d398d8 100644
--- a/mysql-test/t/outfile.test
+++ b/mysql-test/t/outfile.test
@@ -31,13 +31,13 @@ select load_file(concat(@tmpdir,"/outfile-test.3"));
# the following should give errors
disable_query_log;
---error 1086
+--error ER_FILE_EXISTS_ERROR
eval select * into outfile "../tmp/outfile-test.1" from t1;
---error 1086
+--error ER_FILE_EXISTS_ERROR
eval select * into dumpfile "../tmp/outfile-test.2" from t1;
---error 1086
+--error ER_FILE_EXISTS_ERROR
eval select * into dumpfile "../tmp/outfile-test.3" from t1;
enable_query_log;
select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
@@ -92,7 +92,7 @@ use test;
# It should not be possible to write to a file outside of vardir
create table t1(a int);
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---error 1290
+--error ER_OPTION_PREVENTS_STATEMENT
eval select * into outfile "$MYSQL_TEST_DIR/outfile-test1" from t1;
drop table t1;
@@ -105,7 +105,7 @@ create user user_1@localhost;
grant all on mysqltest.* to user_1@localhost;
connect (con28181_1,localhost,user_1,,mysqltest);
---error 1044
+--error ER_DBACCESS_DENIED_ERROR
eval select schema_name
into outfile "../tmp/outfile-test.4"
fields terminated by ',' optionally enclosed by '"'