summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorPatrick Crews <patrick.crews@sun.com>2009-02-19 18:24:25 -0500
committerPatrick Crews <patrick.crews@sun.com>2009-02-19 18:24:25 -0500
commite9b4b536f39d459b51c6b3db308be809003c7210 (patch)
treecdb649a4f978cf26309509f0be874d043fa91bb9 /mysql-test/r/mysqltest.result
parent901427b2413a8f8c80b4720969d101357da57556 (diff)
parentcf571967ad8625643e0a7251e20246207cee46a9 (diff)
downloadmariadb-git-e9b4b536f39d459b51c6b3db308be809003c7210.tar.gz
merge 5.0 -> 5.1
These are only 5.0's fixes being merged. 5.1 and 6.0 Unix-removals will occur in different patches.
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 1a65f90bd65..a61f25058d9 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -215,7 +215,6 @@ source database
"MySQL: The world's most popular ;open source database"
echo message echo message
-mysqltest: At line 1: command "false" failed
mysqltest: At line 1: Missing argument in exec
MySQL
"MySQL"
@@ -383,7 +382,6 @@ mysqltest: At line 1: The argument to dec must be a variable (start with $)
mysqltest: At line 1: End of line junk detected: "1000"
mysqltest: At line 1: Missing arguments to system, nothing to do!
mysqltest: At line 1: Missing arguments to system, nothing to do!
-mysqltest: At line 1: system command 'false' failed
system command 'NonExistsinfComamdn 2> /dev/null' failed
test
test2