From d2fe11cb56789b0b9ba8ef1d4808c70b20dd0bc7 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.blaudden" <>
Date: Mon, 19 Feb 2007 18:23:59 +0100
Subject: [PATCH] Commment out two test's thats just confusing for cmd.exe

---
 mysql-test/r/mysqltest.result | 3 ---
 mysql-test/t/mysqltest.test   | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index a8b5a5ef353..71f1c7de4ed 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -210,7 +210,6 @@ source database
 "MySQL: The world's most popular ;open source database"
 echo message echo message
 
-mysqltest: At line 1: Empty variable
 mysqltest: At line 1: command "false" failed
 mysqltest: At line 1: Missing argument in exec
 MySQL
@@ -507,8 +506,6 @@ drop table t1;
 mysqltest: At line 1: Missing required argument 'filename' to command 'remove_file'
 mysqltest: At line 1: Missing required argument 'filename' to command 'write_file'
 mysqltest: At line 1: End of file encountered before 'EOF' delimiter was found
-mysqltest: At line 1: End of line junk detected: "write_file filename ";
-"
 Some data
 for cat_file command
 of mysqltest
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index f98389effa3..024b12a60e9 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -552,8 +552,8 @@ echo ;
 
 # Illegal use of echo
 
---error 1
---exec echo "echo \$;" | $MYSQL_TEST 2>&1
+#--error 1
+#--exec echo "echo \$;" | $MYSQL_TEST 2>&1
 
 
 # ----------------------------------------------------------------------------
@@ -1469,8 +1469,8 @@ remove_file non_existing_file;
 --error 1
 --exec echo "write_file filename ;" | $MYSQL_TEST 2>&1
 
---error 1
---exec echo "write_file filename \";" | $MYSQL_TEST 2>&1
+#--error 1
+#--exec echo "write_file filename \";" | $MYSQL_TEST 2>&1
 
 write_file $MYSQLTEST_VARDIR/tmp/test_file1.tmp;
 Content for test_file1