diff options
author | unknown <bell@sanja.is.com.ua> | 2002-11-27 11:32:09 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2002-11-27 11:32:09 +0200 |
commit | 9767982aedb23183e8fc9d5ba636971e0d81a2b5 (patch) | |
tree | 5823bb4d6eb700331dfdc95fbb346bc60f6a7348 /mysys/test_charset.c | |
parent | 6987b41456dff437195beb6b6974e48fd0fcf633 (diff) | |
parent | e9f96cf92a82db9afda5cb9fe9d392b29bbdfb9c (diff) | |
download | mariadb-git-9767982aedb23183e8fc9d5ba636971e0d81a2b5.tar.gz |
merging
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysys/test_charset.c')
-rw-r--r-- | mysys/test_charset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/test_charset.c b/mysys/test_charset.c index 47ed9062c05..d031007a1da 100644 --- a/mysys/test_charset.c +++ b/mysys/test_charset.c @@ -46,7 +46,7 @@ static void _print_csinfo(CHARSET_INFO *cs) cs->strnxfrm, cs->like_range); printf("multi-byte: %3s (%d, %p, %p, %p)\n", - cs->mbmaxlen ? "yes" : "no", + cs->mbmaxlen > 1 ? "yes" : "no", cs->mbmaxlen, cs->ismbchar, cs->ismbhead, |