From adefe15c9f623bd4dab7ed99ec1dc6ff9a24bb61 Mon Sep 17 00:00:00 2001
From: unknown <antony@ltantony.mysql.com>
Date: Mon, 9 May 2005 08:33:45 +0100
Subject: [PATCH] Fix outfile test/results

---
 mysql-test/r/outfile.result | Bin 953 -> 683 bytes
 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
index a2720be075aeb427d4f11212b77ba3a2ad254710..a7871592241104fe2a949c98379cfa21dcbe5d68 100644
GIT binary patch
delta 14
WcmdnVzM6Hz0mg}i`jh`M?EwHS^#)-8

literal 953
zcmcIj!A`?44CU;vuzFc1twiZ|0PVsFahP`FhQ!j=V-aan5_izQC#fcFz$p?tT7J*Z
zezqHDdt_A^LcK@&(w;rCTtn?hF`ZH@G2f{jR>oHIHR#ThW7HknfW@OS1Nl5VkTDiN
ztuswFU*y@-6t~Lx7;c|8o51yCsAe=)HLrVZD6ef-E6yLd?HlbDnXm)LM8V|wR%Y`+
zN<qU#8*pv`Ubc`bUM7i0^bhgGQI|<-5e+x+7@WeH7`zh)+mcXWC*3H*65dPEuZn7T
zyOZ})w4?tplcnOQoCs$B@_B~Jgq1hr=?MO<a(T7N%RiM99q%j`)5#|}f60P))zF-u
QD85c&7po-ohz1Gp4JtTDG5`Po

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