Commit ad41369d authored by unknown's avatar unknown
Browse files

Update for running with cmd.exe directly 


mysql-test/r/mysqltest.result:
  Update result file after removing one test
mysql-test/t/mysqltest.test:
  Remove use of "ls" in system
  Rewrite "system echo" which introduces CR/LF problems
  with  "write_file"
  Remove test for end of line junk for "write_file" - it has mismatching number of "'s
parent 2f7a4de6

mysql-test/r/mysqltest.result

+0 −2
Original line number Diff line number Diff line
@@ -516,8 +516,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 ";

"

mysqltest: At line 1: Missing required argument 'filename' to command 'file_exists'

mysqltest: At line 1: Missing required argument 'from_file' to command 'copy_file'

mysqltest: At line 1: Missing required argument 'to_file' to command 'copy_file'

mysql-test/t/mysqltest.test

+35 −22
Original line number Diff line number Diff line
@@ -902,9 +902,9 @@ echo $d; 
# ----------------------------------------------------------------------------

# Test system

# ----------------------------------------------------------------------------

system ls > /dev/null;

#system ls > /dev/null;

system echo "hej" > /dev/null;

--system ls > /dev/null

#--system ls > /dev/null

--system echo "hej" > /dev/null;



--error 1
@@ -1134,18 +1134,24 @@ EOF 
--error 1

--exec echo "{;" | $MYSQL_TEST 2>&1



--system echo "while (0)" > $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo "echo hej;" >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql

while (0)

echo hej;

EOF

--error 1

--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1



--system echo "while (0)" > $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo "{echo hej;" >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql

while (0)

{echo hej;

EOF

--error 1

--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1



--system echo "while (0){" > $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo "echo hej;" >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql

while (0){

 echo hej;

EOF

--error 1

--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1
@@ -1244,28 +1250,34 @@ EOF 
--exec echo "source $MYSQLTEST_VARDIR/tmp/mysqltest.sql; echo OK;" | $MYSQL_TEST 2>&1



# Repeat connect/disconnect, exceed max number of connections

--system echo "let \$i=200;"                              > $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo "while (\$i)"                              >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo "{"                                        >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo " connect (test_con1,localhost,root,,); "  >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo " disconnect test_con1; "                  >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo " dec \$i;                               " >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo "}"                                        >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql

let $i=200;

while ($i)

{

 connect (test_con1,localhost,root,,);

 disconnect test_con1;

 dec $i;

}

EOF

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--error 1

--exec echo "source $MYSQLTEST_VARDIR/tmp/mysqltest.sql;" | $MYSQL_TEST 2>&1



# Select disconnected connection

--system echo "connect (test_con1,localhost,root,,);"    > $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo "disconnect test_con1; "                  >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo "connection test_con1;"                   >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql

connect (test_con1,localhost,root,,);

disconnect test_con1;

connection test_con1;

EOF

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--error 1

--exec echo "source $MYSQLTEST_VARDIR/tmp/mysqltest.sql;" | $MYSQL_TEST 2>&1



# Connection name already used

--system echo "connect (test_con1,localhost,root,,);"    > $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--system echo "connect (test_con1,localhost,root,,);"   >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql

--write_file $MYSQLTEST_VARDIR/tmp/mysqltest.sql

connect (test_con1,localhost,root,,);

connect (test_con1,localhost,root,,);

EOF

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--error 1

--exec echo "source $MYSQLTEST_VARDIR/tmp/mysqltest.sql;" | $MYSQL_TEST 2>&1
@@ -1502,8 +1514,9 @@ 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

# Comment out this test as it confuses cmd.exe with unmatched "

#--error 1

#--exec echo "write_file filename \";" | $MYSQL_TEST 2>&1



write_file $MYSQLTEST_VARDIR/tmp/test_file1.tmp;

Content for test_file1