diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-25 15:01:03 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-25 15:01:03 +0400 |
| commit | 71f8ca654eceea835d6330eb511ce41643dfaeb5 (patch) | |
| tree | 2e87ceb27347664cd9317b7ba24a6cbc0f47749a /include/m_ctype.h | |
| parent | a6e28ce5e6a1cb2c5e4eaf9e900e7d6339094a75 (diff) | |
| download | mariadb-git-71f8ca654eceea835d6330eb511ce41643dfaeb5.tar.gz | |
MDEV-5180 Data type for WEIGHT_STRING is too short in some cases
(a bug in upstream)
Diffstat (limited to 'include/m_ctype.h')
| -rw-r--r-- | include/m_ctype.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 826f0b98488..b9682df12bf 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -188,6 +188,7 @@ extern MY_UNI_CTYPE my_uni_ctype[256]; #define MY_CS_NONASCII 8192 /* if not ASCII-compatible */ #define MY_CS_UNICODE_SUPPLEMENT 16384 /* Non-BMP Unicode characters */ #define MY_CS_LOWER_SORT 32768 /* If use lower case as weight */ +#define MY_CS_STRNXFRM_BAD_NWEIGHTS 0x10000 /* strnxfrm ignores "nweights" */ #define MY_CHARSET_UNDEFINED 0 /* Character repertoire flags */ @@ -672,6 +673,7 @@ size_t my_strnxfrm_mb(CHARSET_INFO *, size_t my_strnxfrm_unicode(CHARSET_INFO *, uchar *dst, size_t dstlen, uint nweights, const uchar *src, size_t srclen, uint flags); +size_t my_strnxfrmlen_unicode(CHARSET_INFO *, size_t); size_t my_strnxfrm_unicode_full_bin(CHARSET_INFO *, uchar *dst, size_t dstlen, uint nweights, |