diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-14 19:59:28 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-14 19:59:28 +0300 |
| commit | b886cac7123bc37d055fecd49d9a30ce0c39da73 (patch) | |
| tree | c20877daef97377e843fd3c821a58b6c90f08174 /strings | |
| parent | c0f04fa31cd46c2507b2152eeeeb4950e0d5edc9 (diff) | |
| download | mariadb-git-b886cac7123bc37d055fecd49d9a30ce0c39da73.tar.gz | |
Fixed compiler errors
Updated test to also work on 32 bit
mysql-test/suite/heap/heap.test:
Updated test to also work on 32 bit
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-ucs2.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index 83ea3739f4c..52eaece5528 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -2317,13 +2317,18 @@ void my_fill_utf32(CHARSET_INFO *cs, char *s, size_t slen, int fill) { char buf[10]; +#ifndef DBUG_OFF uint buflen; +#endif char *e= s + slen; DBUG_ASSERT((slen % 4) == 0); - buflen= cs->cset->wc_mb(cs, (my_wc_t) fill, (uchar*) buf, - (uchar*) buf + sizeof(buf)); +#ifndef DBUG_OFF + buflen= +#endif + cs->cset->wc_mb(cs, (my_wc_t) fill, (uchar*) buf, + (uchar*) buf + sizeof(buf)); DBUG_ASSERT(buflen == 4); while (s < e) { |