diff options
| author | unknown <monty@mysql.com> | 2005-05-14 16:24:36 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-05-14 16:24:36 +0300 |
| commit | 2fc28a36ad0e5c8c1681defe80be5352900c4b11 (patch) | |
| tree | 438b1bf66c03f295f0c2546a80859345423c0539 /mysql-test/t/outfile.test | |
| parent | 4cda05b44ba3b8f4cc69d94f3cc0fc701dfc5b99 (diff) | |
| download | mariadb-git-2fc28a36ad0e5c8c1681defe80be5352900c4b11.tar.gz | |
After merge fixes
BitKeeper/deleted/.del-outfile2.result~fb702ee2518d8e6d:
Delete: mysql-test/r/outfile2.result
libmysql/libmysql.c:
Fix indentation for new function mysql_set_character_set()
mysql-test/r/alter_table.result:
Fix test to be in same order as in 4.0
mysql-test/r/innodb.result:
After merge fix
mysql-test/r/insert_update.result:
Add extra test for insert into ... on duplicate key upate
mysql-test/r/outfile.result:
After merge fix
mysql-test/t/alter_table.test:
Fix test to be in same order as in 4.0
mysql-test/t/insert_update.test:
Add extra test for insert into ... on duplicate key upate
mysql-test/t/outfile.test:
After merge fix
sql/item_func.cc:
After merge fix
sql/sql_table.cc:
After merge fix
Diffstat (limited to 'mysql-test/t/outfile.test')
| -rw-r--r-- | mysql-test/t/outfile.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/outfile.test b/mysql-test/t/outfile.test index b029a65284c..4b12f9e4e50 100644 --- a/mysql-test/t/outfile.test +++ b/mysql-test/t/outfile.test @@ -38,6 +38,7 @@ select load_file(concat(@tmpdir,"/outfile-test.3")); #--error 1086 #eval select * into dumpfile "$MYSQL_TEST_DIR/var/tmp/outfile-test.3" from t1; #enable_query_log; +--error 13,2 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 |