diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-17 16:23:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-17 16:23:08 +0400 |
| commit | 768751c786b32823d80c12966e74a12de42b75f6 (patch) | |
| tree | 66cfda44ba496d381fb164d9e4470f070999770a /strings | |
| parent | 074455105cc760140925ac083efc2c38c6adb243 (diff) | |
| parent | dc407270a1b4911ece0ff9a52ae6af8443b30f39 (diff) | |
| download | mariadb-git-768751c786b32823d80c12966e74a12de42b75f6.tar.gz | |
Merge 5.5->10.0-base
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-utf8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index c3dc0da8797..cc19148b973 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -2101,7 +2101,7 @@ my_strnxfrm_unicode(CHARSET_INFO *cs, const uchar *se = src + srclen; MY_UNICASE_INFO * const*uni_plane= (cs->state & MY_CS_BINSORT) ? NULL : cs->caseinfo; - DBUG_ASSERT(src); + DBUG_ASSERT(!srclen || src); while (dst < de_beg) { @@ -2145,7 +2145,7 @@ my_strnxfrm_unicode_full_bin(CHARSET_INFO *cs, const uchar *se = src + srclen; LINT_INIT(wc); - DBUG_ASSERT(src); + DBUG_ASSERT(!srclen || src); DBUG_ASSERT(cs->state & MY_CS_BINSORT); while (dst < de_beg) |