summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2004-09-10 22:19:52 +0300
committerbell@sanja.is.com.ua <>2004-09-10 22:19:52 +0300
commitc6634707c498c3e51dfe6a387f274f08e2f8e1ea (patch)
treee98dc176114eb24ed68f2e94edb8799003634f1c /strings
parent796b6254207f12e75960a6254afcf7799d7eaf8b (diff)
downloadmariadb-git-c6634707c498c3e51dfe6a387f274f08e2f8e1ea.tar.gz
Put Ramil patch to be able push me code (test suite already is included in query_cache.test)
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-simple.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index 84bfcb0b171..58535cbfc69 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -27,8 +27,7 @@ int my_strnxfrm_simple(CHARSET_INFO * cs,
const uchar *src, uint srclen)
{
uchar *map= cs->sort_order;
- DBUG_ASSERT(len >= srclen);
- len= min(len,srclen);
+ set_if_smaller(len, srclen);
if (dest != src)
{
const uchar *end;