summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-09-28 11:34:53 +0200
committermsvensson@neptunus.(none) <>2005-09-28 11:34:53 +0200
commitfbf4a5e07962792a918207541a2666a7968df4ca (patch)
tree5b0761b29daf8c864538d0fb55e20e9b54758e47 /mysql-test/r/mysqltest.result
parent70b9b5eef34a608f415db270e1914e6163d90ced (diff)
parent1105d4293dfa37e1658956b07e48908495fa65f7 (diff)
downloadmariadb-git-fbf4a5e07962792a918207541a2666a7968df4ca.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index c643a5ae647..7c01b7bdfba 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -180,6 +180,7 @@ 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"
@@ -301,6 +302,7 @@ mysqltest: At line 1: First 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
test
test2
test3
@@ -344,6 +346,10 @@ mysqltest: At line 1: Wrong column number to replace_column in 'replace_column 1
mysqltest: At line 1: Invalid integer argument "10!"
mysqltest: At line 1: End of line junk detected: "!"
mysqltest: At line 1: Invalid integer argument "a"
+Output from mysqltest-x.inc
+Output from mysqltest-x.inc
+Output from mysqltest-x.inc
+mysqltest: Could not open ./non_existing_file.inc: errno = 2
failing_statement;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing_statement' at line 1
failing_statement;