diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-28 16:51:09 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-28 16:51:09 +0300 |
| commit | 7b91240bbab3094c8c148c46949c0202ae1e991d (patch) | |
| tree | 089b3976be2b065d307fdd01b8db6de7d473a16f /strings | |
| parent | 85a789998872c7215f24ba89f0d1f2335e314d07 (diff) | |
| download | mariadb-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')
| -rw-r--r-- | strings/ctype-uca.c | 4 | ||||
| -rw-r--r-- | strings/xml.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index b2a60265a0a..3d08e466ca3 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -7002,7 +7002,7 @@ static my_uca_scanner_handler my_ucs2_uca_scanner_handler= my_uca_scanner_next_ucs2 }; -#endif +#endif /* HAVE_CHARSET_ucs2 */ /* @@ -8832,7 +8832,7 @@ CHARSET_INFO my_charset_ucs2_croatian_uca_ci= }; -#endif +#endif /* HAVE_CHARSET_ucs2 */ #ifdef HAVE_CHARSET_utf8 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++) |