diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-17 17:28:48 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-17 17:28:48 +0400 |
| commit | 9f4dd86c2ee02e0ec46272c9c05db1ddb26b8db6 (patch) | |
| tree | faae50896a871230af1df0347f5e0c5edacb824c /strings | |
| parent | 71f4a24d0691cacfbb315b5242ddf718b3c078cd (diff) | |
| parent | 768751c786b32823d80c12966e74a12de42b75f6 (diff) | |
| download | mariadb-git-9f4dd86c2ee02e0ec46272c9c05db1ddb26b8db6.tar.gz | |
Merge 10.0-base->10.0
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 159299a9ea0..e564a85c828 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -4596,7 +4596,7 @@ my_strnxfrm_unicode(CHARSET_INFO *cs, MY_UNICASE_INFO *uni_plane= (cs->state & MY_CS_BINSORT) ? NULL : cs->caseinfo; LINT_INIT(wc); - DBUG_ASSERT(src); + DBUG_ASSERT(!srclen || src); for (; dst < de && nweights; nweights--) { @@ -4648,7 +4648,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); for ( ; dst < de && nweights; nweights--) |