Merge bk-internal:/home/bk/mysql-4.0/

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

mysys/default.c

@@ -460,7 +460,7 @@ static char *remove_end_comment(char *ptr)
       else if (quote == *ptr)
 	quote= 0;
     }
-    if (!quote && *ptr == '#') /* We are not inside a comment */
+    if (!quote && *ptr == '#') /* We are not inside a string */
     {
       *ptr= 0;
       return ptr;