diff options
| author | unknown <monty@mishka.local> | 2004-10-20 02:55:03 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-10-20 02:55:03 +0300 |
| commit | 2da1cbd97dd566d629115f02321ab36aac069ce4 (patch) | |
| tree | 40c316b93bfec146a18945a7cd7813bcc5a5a179 /strings | |
| parent | ca1a24e0ad171272d2bcddcac737694af6c251a3 (diff) | |
| parent | 4736d0fe9963742e2788960d60da7f0f2dd593e9 (diff) | |
| download | mariadb-git-2da1cbd97dd566d629115f02321ab36aac069ce4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
client/mysqlimport.c:
Auto merged
libmysql/libmysql.c:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/Makefile.am | 2 | ||||
| -rw-r--r-- | strings/xml.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am index be51e48ef8d..d17a4f598a6 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -57,7 +57,7 @@ EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-win1250ch.c \ t_ctype.h libmystrings_a_LIBADD= -conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c +conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c conf_to_src_LDADD= #force static linking of conf_to_src - essential when linking against #custom installation of libc diff --git a/strings/xml.c b/strings/xml.c index 7d7839e1603..6ba52ea41a8 100644 --- a/strings/xml.c +++ b/strings/xml.c @@ -81,10 +81,11 @@ static int my_xml_scan(MY_XML_PARSER *p,MY_XML_ATTR *a) a->beg=p->cur; a->end=p->cur; - if (!memcmp(p->cur,"<!--",4)) + if (!bcmp(p->cur,"<!--",4)) { - for( ; (p->cur < p->end) && memcmp(p->cur, "-->", 3); p->cur++); - if(!memcmp(p->cur, "-->", 3)) + for( ; (p->cur < p->end) && bcmp(p->cur, "-->", 3); p->cur++) + {} + if (!bcmp(p->cur, "-->", 3)) p->cur+=3; a->end=p->cur; lex=MY_XML_COMMENT; |