summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-03-23 19:26:03 +0100
committerunknown <serg@serg.mylan>2004-03-23 19:26:03 +0100
commit57c48a22b6e271a0eb1ffd0552cd5d6e5d0a7b42 (patch)
treee0f3475bfa6867c78cc35e9a103bc3314e498a8f
parenta99039f8bf89a434748c3815ce21fed717ecee52 (diff)
parentd7801e0624bbaf88466c2502fdfe4f4c92996e5c (diff)
downloadmariadb-git-57c48a22b6e271a0eb1ffd0552cd5d6e5d0a7b42.tar.gz
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
-rw-r--r--mysys/default.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c
index 3c9f9c823a1..1c4547bdb0a 100644
--- a/mysys/default.c
+++ b/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;