summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <vva@eagle.mysql.r18.ru>2004-02-14 02:28:19 +0400
committerunknown <vva@eagle.mysql.r18.ru>2004-02-14 02:28:19 +0400
commit4ec12a5e55d5f2db27a5c0ce93c7e74254d652a4 (patch)
treebd5a2dc2ad240abad0e442509551d645f1639a88 /include
parent4c6344ed6632f6f46f679b7194f2358452d5e04b (diff)
parentf05d5c844f7e7cead2b9aa054cf8ad2bcc7daf4b (diff)
downloadmariadb-git-4ec12a5e55d5f2db27a5c0ce93c7e74254d652a4.tar.gz
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2592/mysql-4.1
Diffstat (limited to 'include')
-rw-r--r--include/m_ctype.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h
index 88c3418fc0d..9c843382fc7 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -391,7 +391,11 @@ extern my_bool my_parse_charset_xml(const char *bug, uint len,
#define use_mb(s) ((s)->cset->ismbchar != NULL)
#define my_ismbchar(s, a, b) ((s)->cset->ismbchar((s), (a), (b)))
+#ifdef USE_MB
#define my_mbcharlen(s, a) ((s)->cset->mbcharlen((s),(a)))
+#else
+#define my_mbcharlen(s, a) 1
+#endif
#define my_caseup(s, a, l) ((s)->cset->caseup((s), (a), (l)))
#define my_casedn(s, a, l) ((s)->cset->casedn((s), (a), (l)))