Commit 082ad734 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Manual merge
parents 8cb50382 a8be1b93

mysql-test/r/mysqltest.result

+0 −1
Original line number Diff line number Diff line
@@ -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

mysql-test/t/mysqltest.test

+2 −2
Original line number Diff line number Diff line
@@ -555,8 +555,8 @@ echo ; 


# Illegal use of echo



--error 1

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

#--error 1

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





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