summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <knielsen@mysql.com>2006-01-11 13:03:19 +0100
committerunknown <knielsen@mysql.com>2006-01-11 13:03:19 +0100
commitaa6d8dcc74040b0dec2b923c5b4ccf8d8262d654 (patch)
tree7aa0d8e878cdcbfe08029ab20947292f81227d36 /mysql-test/r
parent7ea07618b05ebc4484ba94fdfa29f4f6549e7601 (diff)
parentcea02f8c0d886ea068f019cf7d3c56d68e7a7c63 (diff)
downloadmariadb-git-aa6d8dcc74040b0dec2b923c5b4ccf8d8262d654.tar.gz
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/usr/local/mysql/tmpbuild
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/mysqltest.result21
1 files changed, 1 insertions, 20 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 2657fb8a409..067054510c2 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -149,7 +149,7 @@ hello
mysqltest: At line 1: End of line junk detected: "6"
mysqltest: At line 1: End of line junk detected: "6"
mysqltest: At line 1: Missing delimiter
-mysqltest: End of line junk detected: "sleep 7
+mysqltest: At line 1: End of line junk detected: "sleep 7
# Another comment
"
mysqltest: At line 1: Extra delimiter ";" found
@@ -222,25 +222,6 @@ mysqltest: At line 1: Missing arguments to let
mysqltest: At line 1: Missing variable name in let
mysqltest: At line 1: Variable name in =hi does not start with '$'
mysqltest: At line 1: Missing assignment operator in let
-var1
-hi 1 hi there
-hi
-1
-hi there
-var2
-2
-
-
-var2 again
-2
-
-2
-
-var3 two columns with same name
-1 2 3
-2
-2
-3
mysqltest: At line 1: Missing file name in source
mysqltest: At line 1: Could not open file ./non_existingFile
mysqltest: In included file "./var/tmp/recursive.sql": At line 1: Source directives are nesting too deep