Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools

into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged

1 files changed, 36 insertions, 8 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index f4fa95afeb1..87d8484dbf8 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -3578,17 +3578,15 @@ void scan_command_for_warnings(struct st_command *command)
 
 /*
   Check for unexpected "junk" after the end of query
-  This is normally caused by missing delimiters
+  This is normally caused by missing delimiters or when
+  switching between different delimiters
 */
 
-void check_eol_junk(const char *eol)
+void check_eol_junk_line(const char *line)
 {
-  const char *p= eol;
-  DBUG_ENTER("check_eol_junk");
-  DBUG_PRINT("enter", ("eol: %s", eol));
-  /* Remove all spacing chars except new line */
-  while (*p && my_isspace(charset_info, *p) && (*p != '\n'))
-    p++;
+  const char *p= line;
+  DBUG_ENTER("check_eol_junk_line");
+  DBUG_PRINT("enter", ("line: %s", line));
 
   /* Check for extra delimiter */
   if (*p && !strncmp(p, delimiter, delimiter_length))
@@ -3604,6 +3602,36 @@ void check_eol_junk(const char *eol)
   DBUG_VOID_RETURN;
 }
 
+void check_eol_junk(const char *eol)
+{
+  const char *p= eol;
+  DBUG_ENTER("check_eol_junk");
+  DBUG_PRINT("enter", ("eol: %s", eol));
+
+  /* Skip past all spacing chars and comments */
+  while (*p && (my_isspace(charset_info, *p) || *p == '#' || *p == '\n'))
+  {
+    /* Skip past comments started with # and ended with newline */
+    if (*p && *p == '#')
+    {
+      p++;
+      while (*p && *p != '\n')
+        p++;
+    }
+
+    /* Check this line */
+    if (*p && *p == '\n')
+      check_eol_junk_line(p);
+
+    if (*p)
+      p++;
+  }
+
+  check_eol_junk_line(p);
+
+  DBUG_VOID_RETURN;
+}
+
 
 
 /*