diff options
author | unknown <bell@sanja.is.com.ua> | 2004-03-23 22:11:50 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-03-23 22:11:50 +0200 |
commit | 5a88bc3c87fe182af8a5ad5035c38361138ca891 (patch) | |
tree | c9452109c2b79031a760903bc1c2640f378f2141 /mysys | |
parent | 0e75717d1f95d4f19b376f23b6990f779960eb3d (diff) | |
parent | 57c48a22b6e271a0eb1ffd0552cd5d6e5d0a7b42 (diff) | |
download | mariadb-git-5a88bc3c87fe182af8a5ad5035c38361138ca891.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.c | 2 |
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; |