mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Big5 conversion routines
include/m_ctype.h: Add conversion routines prototypes sql/init.cc: Fix for small bug
This commit is contained in:
@@ -120,10 +120,8 @@ extern void my_casedn_8bit(CHARSET_INFO *, char *, uint);
|
|||||||
extern int my_strcasecmp_8bit(CHARSET_INFO * cs, const char *, const char *);
|
extern int my_strcasecmp_8bit(CHARSET_INFO * cs, const char *, const char *);
|
||||||
extern int my_strncasecmp_8bit(CHARSET_INFO * cs, const char *, const char *, uint);
|
extern int my_strncasecmp_8bit(CHARSET_INFO * cs, const char *, const char *, uint);
|
||||||
|
|
||||||
int my_mb_wc_8bit(CHARSET_INFO *cs,my_wc_t *wc,
|
int my_mb_wc_8bit(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
|
||||||
const unsigned char *s,const unsigned char *e);
|
int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
|
||||||
int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc,
|
|
||||||
unsigned char *s, unsigned char *e);
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef USE_MB
|
#ifdef USE_MB
|
||||||
@@ -146,6 +144,8 @@ extern my_bool my_like_range_big5(CHARSET_INFO *,const char *, uint, pchar, uint
|
|||||||
extern int ismbchar_big5(CHARSET_INFO *, const char *, const char *);
|
extern int ismbchar_big5(CHARSET_INFO *, const char *, const char *);
|
||||||
extern my_bool ismbhead_big5(CHARSET_INFO *, uint);
|
extern my_bool ismbhead_big5(CHARSET_INFO *, uint);
|
||||||
extern int mbcharlen_big5(CHARSET_INFO *, uint);
|
extern int mbcharlen_big5(CHARSET_INFO *, uint);
|
||||||
|
int my_mb_wc_big5(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
|
||||||
|
int my_wc_mb_big5(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CHARSET_czech
|
#ifdef HAVE_CHARSET_czech
|
||||||
@@ -164,6 +164,8 @@ extern uchar ctype_euc_kr[], to_lower_euc_kr[], to_upper_euc_kr[], sort_order_eu
|
|||||||
extern int ismbchar_euc_kr(CHARSET_INFO *, const char *, const char *);
|
extern int ismbchar_euc_kr(CHARSET_INFO *, const char *, const char *);
|
||||||
extern my_bool ismbhead_euc_kr(CHARSET_INFO *, uint);
|
extern my_bool ismbhead_euc_kr(CHARSET_INFO *, uint);
|
||||||
extern int mbcharlen_euc_kr(CHARSET_INFO *, uint);
|
extern int mbcharlen_euc_kr(CHARSET_INFO *, uint);
|
||||||
|
int my_mb_wc_euc_kr(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
|
||||||
|
int my_wc_mb_euc_kr(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CHARSET_gb2312
|
#ifdef HAVE_CHARSET_gb2312
|
||||||
@@ -172,6 +174,8 @@ extern uchar ctype_gb2312[], to_lower_gb2312[], to_upper_gb2312[], sort_order_gb
|
|||||||
extern int ismbchar_gb2312(CHARSET_INFO *, const char *, const char *);
|
extern int ismbchar_gb2312(CHARSET_INFO *, const char *, const char *);
|
||||||
extern my_bool ismbhead_gb2312(CHARSET_INFO *, uint);
|
extern my_bool ismbhead_gb2312(CHARSET_INFO *, uint);
|
||||||
extern int mbcharlen_gb2312(CHARSET_INFO *, uint);
|
extern int mbcharlen_gb2312(CHARSET_INFO *, uint);
|
||||||
|
int my_mb_wc_gb2312(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
|
||||||
|
int my_wc_mb_gb2312(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CHARSET_gbk
|
#ifdef HAVE_CHARSET_gbk
|
||||||
@@ -184,6 +188,8 @@ extern my_bool my_like_range_gbk(CHARSET_INFO *, const char *, uint, pchar, uint
|
|||||||
extern int ismbchar_gbk(CHARSET_INFO *, const char *, const char *);
|
extern int ismbchar_gbk(CHARSET_INFO *, const char *, const char *);
|
||||||
extern my_bool ismbhead_gbk(CHARSET_INFO *, uint);
|
extern my_bool ismbhead_gbk(CHARSET_INFO *, uint);
|
||||||
extern int mbcharlen_gbk(CHARSET_INFO *, uint);
|
extern int mbcharlen_gbk(CHARSET_INFO *, uint);
|
||||||
|
int my_mb_wc_gbk(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
|
||||||
|
int my_wc_mb_gbk(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CHARSET_latin1_de
|
#ifdef HAVE_CHARSET_latin1_de
|
||||||
@@ -205,6 +211,8 @@ extern my_bool my_like_range_sjis(CHARSET_INFO *, const char *, uint, pchar, uin
|
|||||||
extern int ismbchar_sjis(CHARSET_INFO *, const char *, const char *);
|
extern int ismbchar_sjis(CHARSET_INFO *, const char *, const char *);
|
||||||
extern my_bool ismbhead_sjis(CHARSET_INFO *, uint);
|
extern my_bool ismbhead_sjis(CHARSET_INFO *, uint);
|
||||||
extern int mbcharlen_sjis(CHARSET_INFO *, uint);
|
extern int mbcharlen_sjis(CHARSET_INFO *, uint);
|
||||||
|
int my_mb_wc_sjis(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
|
||||||
|
int my_wc_mb_sjis(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CHARSET_tis620
|
#ifdef HAVE_CHARSET_tis620
|
||||||
@@ -222,6 +230,8 @@ extern uchar ctype_ujis[], to_lower_ujis[], to_upper_ujis[], sort_order_ujis[];
|
|||||||
extern int ismbchar_ujis(CHARSET_INFO *, const char *, const char *);
|
extern int ismbchar_ujis(CHARSET_INFO *, const char *, const char *);
|
||||||
extern my_bool ismbhead_ujis(CHARSET_INFO *, uint);
|
extern my_bool ismbhead_ujis(CHARSET_INFO *, uint);
|
||||||
extern int mbcharlen_ujis(CHARSET_INFO *, uint);
|
extern int mbcharlen_ujis(CHARSET_INFO *, uint);
|
||||||
|
int my_mb_wc_euc_jp(CHARSET_INFO *cs,my_wc_t *wc, const uchar *s,const uchar *e);
|
||||||
|
int my_wc_mb_euc_jp(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CHARSET_utf8
|
#ifdef HAVE_CHARSET_utf8
|
||||||
|
@@ -60,7 +60,7 @@ void unireg_init(ulong options)
|
|||||||
uchar max_char;
|
uchar max_char;
|
||||||
if (!cs->sort_order)
|
if (!cs->sort_order)
|
||||||
continue;
|
continue;
|
||||||
cs->sort_order[(uchar) cs->max_sort_char];
|
max_char=cs->sort_order[(uchar) cs->max_sort_char];
|
||||||
for (i = 0; i < 256; i++)
|
for (i = 0; i < 256; i++)
|
||||||
{
|
{
|
||||||
if ((uchar) cs->sort_order[i] > max_char)
|
if ((uchar) cs->sort_order[i] > max_char)
|
||||||
|
5824
strings/ctype-big5.c
5824
strings/ctype-big5.c
File diff suppressed because it is too large
Load Diff
@@ -2848,8 +2848,8 @@ CHARSET_INFO compiled_charsets[] = {
|
|||||||
ismbchar_big5,
|
ismbchar_big5,
|
||||||
ismbhead_big5,
|
ismbhead_big5,
|
||||||
mbcharlen_big5,
|
mbcharlen_big5,
|
||||||
NULL, /* mb_wc */
|
my_mb_wc_big5, /* mb_wc */
|
||||||
NULL, /* wc_mb */
|
my_wc_mb_big5, /* wc_mb */
|
||||||
my_caseup_str_mb,
|
my_caseup_str_mb,
|
||||||
my_casedn_str_mb,
|
my_casedn_str_mb,
|
||||||
my_caseup_mb,
|
my_caseup_mb,
|
||||||
|
Reference in New Issue
Block a user