diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-17 15:19:26 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-17 15:19:26 +0400 |
| commit | dc407270a1b4911ece0ff9a52ae6af8443b30f39 (patch) | |
| tree | 421fe3091f6d111803e601193c83b3dcfbbb3746 /strings | |
| parent | 39a8d7965d912d8fb32436735449ce04e85583d1 (diff) | |
| download | mariadb-git-dc407270a1b4911ece0ff9a52ae6af8443b30f39.tar.gz | |
MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
Fixed a wrong assertion.
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 6edaaa099f6..28fa6163dfe 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) |