summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-10-05 12:25:24 +0200
committerunknown <msvensson@neptunus.(none)>2006-10-05 12:25:24 +0200
commit4c8931294b600b2388d970e2324c4fc63ccea4b8 (patch)
treec955f8bbd3f09608fa646db8bc45be447c35809d /mysql-test/r/mysqltest.result
parent95e329152f9d168aab504752dbd0c34517febb0b (diff)
downloadmariadb-git-4c8931294b600b2388d970e2324c4fc63ccea4b8.tar.gz
Improve "check_eol_junk" to detect junk although there are multi line comments in the way.
I.e take advantage of the fact that a # comment is always terminated by a new line Add tests for the above client/mysqltest.c: Improve "check_eol_junk" to detect junk although there are multi line comments in the way. I.e take advantage of the fact that a # comment is always terminated by a new line mysql-test/r/mysqltest.result: Update resut file mysql-test/t/mysqltest.test: Add test for improved check_eol_junk
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result17
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 4c243a64484..ed7267fb71d 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -152,6 +152,23 @@ mysqltest: At line 1: Missing delimiter
mysqltest: At line 1: End of line junk detected: "sleep 7
# Another comment
"
+mysqltest: At line 1: Missing delimiter
+mysqltest: At line 1: Missing delimiter
+mysqltest: At line 1: End of line junk detected: "disconnect default
+
+#
+# comment
+# comment2
+
+# comment 3
+--disable_query_log
+"
+mysqltest: At line 1: End of line junk detected: "disconnect default # comment
+# comment part2
+
+# comment 3
+--disable_query_log
+"
mysqltest: At line 1: Extra delimiter ";" found
mysqltest: At line 1: Extra delimiter ";" found
mysqltest: At line 1: Missing argument(s) to 'error'