summaryrefslogtreecommitdiff
path: root/strings/xml.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-08-28 16:51:09 +0300
committerMichael Widenius <monty@askmonty.org>2010-08-28 16:51:09 +0300
commit7b91240bbab3094c8c148c46949c0202ae1e991d (patch)
tree089b3976be2b065d307fdd01b8db6de7d473a16f /strings/xml.c
parent85a789998872c7215f24ba89f0d1f2335e314d07 (diff)
downloadmariadb-git-7b91240bbab3094c8c148c46949c0202ae1e991d.tar.gz
Fixed build & test failures in buildbot
mysql-test/t/bug46080-master.opt: Lower limits to be able to run tests regex/main.c: Fixed compiler warnings storage/maria/ma_key_recover.c: Fixed compiler warnings storage/maria/ma_recovery.c: Fixed compiler warnings storage/maria/ma_unique.c: Fixed compiler warnings strings/ctype-uca.c: Added comment strings/xml.c: Fixed compiler warnings support-files/compiler_warnings.supp: Added suppressions for windows unittest/strings/strings-t.c: Added ifdef to fix compilation failure when compiling without UCA
Diffstat (limited to 'strings/xml.c')
-rw-r--r--strings/xml.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/strings/xml.c b/strings/xml.c
index 1b697ec6b26..14da69e088a 100644
--- a/strings/xml.c
+++ b/strings/xml.c
@@ -123,16 +123,16 @@ static int my_xml_scan(MY_XML_PARSER *p,MY_XML_ATTR *a)
a->beg=p->cur;
a->end=p->cur;
- if ((p->end - p->cur > 3) && !bcmp(p->cur,"<!--",4))
+ if ((p->end - p->cur > 3) && !bcmp((uchar*) p->cur, (uchar*) "<!--",4))
{
- for (; (p->cur < p->end) && bcmp(p->cur, "-->", 3); p->cur++)
+ for (; (p->cur < p->end) && bcmp((uchar*) p->cur, (uchar*) "-->", 3); p->cur++)
{}
- if (!bcmp(p->cur, "-->", 3))
+ if (!bcmp((uchar*) p->cur, (uchar*) "-->", 3))
p->cur+=3;
a->end=p->cur;
lex=MY_XML_COMMENT;
}
- else if (!bcmp(p->cur, "<![CDATA[",9))
+ else if (!bcmp((uchar*) p->cur, (uchar*) "<![CDATA[",9))
{
p->cur+= 9;
for (; p->cur < p->end - 2 ; p->cur++)