summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-03-23 22:11:50 +0200
committerunknown <bell@sanja.is.com.ua>2004-03-23 22:11:50 +0200
commit609c03c4cbdf9fd25d375ae68ab5e132fa12d0a7 (patch)
treec9452109c2b79031a760903bc1c2640f378f2141 /mysys
parentdef79abd6dbb9649811b44878412717e02292549 (diff)
parentc4a2464682054b169003f42a5e9600384bd2963e (diff)
downloadmariadb-git-609c03c4cbdf9fd25d375ae68ab5e132fa12d0a7.tar.gz
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-conf-4.0 mysys/default.c: Auto merged
Diffstat (limited to 'mysys')
-rw-r--r--mysys/default.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c
index e79b598101d..a913db2c487 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -461,7 +461,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;