diff options
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-ucs2.c | 4 | ||||
| -rw-r--r-- | strings/strings_def.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index 071d50d8256..3913ab054db 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -2618,14 +2618,14 @@ void my_fill_utf32(CHARSET_INFO *cs, char *s, size_t slen, int fill) { char buf[10]; -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS uint buflen; #endif char *e= s + slen; DBUG_ASSERT((slen % 4) == 0); -#ifndef DBUG_OFF +#ifdef DBUG_ASSERT_EXISTS buflen= #endif cs->cset->wc_mb(cs, (my_wc_t) fill, (uchar*) buf, diff --git a/strings/strings_def.h b/strings/strings_def.h index f1fcfe2f7cc..afe737ab301 100644 --- a/strings/strings_def.h +++ b/strings/strings_def.h @@ -17,6 +17,7 @@ /* This file is to be include first in all files in the string directory */ +#undef DBUG_ASSERT_AS_PRINTF #include <my_global.h> /* Define standar vars */ #include "m_string.h" /* Exernal defintions of string functions */ |