database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Preparing to use my_charset_bin instead of binary_flag

Browse Source
This commit is contained in:
unknown
2002-10-23 18:20:45 +05:00
parent efe61a86bf
commit b75c3dac19
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/m_ctype.h
View File

@ -48,6 +48,7 @@ typedef struct unicase_info_st {
#define MY_CS_CONFIG 2 /* sets that have a *.conf file */ #define MY_CS_CONFIG 2 /* sets that have a *.conf file */
#define MY_CS_INDEX 4 /* sets listed in the Index file */ #define MY_CS_INDEX 4 /* sets listed in the Index file */
#define MY_CS_LOADED 8 /* sets that are currently loaded */ #define MY_CS_LOADED 8 /* sets that are currently loaded */
#define MY_CS_BINSORT 16 /* if binary sort order */
#define MY_CHARSET_UNDEFINED 0 #define MY_CHARSET_UNDEFINED 0
#define MY_CHARSET_CURRENT (default_charset_info->number) #define MY_CHARSET_CURRENT (default_charset_info->number)
@ -116,6 +117,7 @@ typedef struct charset_info_st
} CHARSET_INFO; } CHARSET_INFO;
extern CHARSET_INFO *my_charset_bin;
extern CHARSET_INFO *default_charset_info; extern CHARSET_INFO *default_charset_info;
extern CHARSET_INFO *system_charset_info; extern CHARSET_INFO *system_charset_info;
extern CHARSET_INFO *all_charsets[256]; extern CHARSET_INFO *all_charsets[256];

6
strings/ctype-bin.c
View File

@ -146,10 +146,10 @@ void my_hash_sort_bin(CHARSET_INFO *cs __attribute__((unused)),
CHARSET_INFO my_charset_bin = static CHARSET_INFO my_charset_bin_st =
{ {
63, /* number */ 63, /* number */
MY_CS_COMPILED, /* state */ MY_CS_COMPILED|MY_CS_BINSORT,/* state */
"binary", /* name */ "binary", /* name */
"", /* comment */ "", /* comment */
NULL, /* ctype */ NULL, /* ctype */
@ -180,3 +180,5 @@ CHARSET_INFO my_charset_bin =
255 /* max_sort_char */ 255 /* max_sort_char */
}; };
CHARSET_INFO *my_charset_bin = &my_charset_bin_st;

3
strings/ctype.c
View File

@ -3658,7 +3658,6 @@ CHARSET_INFO *system_charset_info = &compiled_charsets[0];
#define MY_ADD_CHARSET(x) all_charsets[(x)->number]=(x) #define MY_ADD_CHARSET(x) all_charsets[(x)->number]=(x)
extern CHARSET_INFO my_charset_bin;
extern CHARSET_INFO my_charset_big5; extern CHARSET_INFO my_charset_big5;
extern CHARSET_INFO my_charset_czech; extern CHARSET_INFO my_charset_czech;
extern CHARSET_INFO my_charset_euc_kr; extern CHARSET_INFO my_charset_euc_kr;
@ -3677,7 +3676,7 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
{ {
CHARSET_INFO *cs; CHARSET_INFO *cs;
MY_ADD_CHARSET(&my_charset_bin); MY_ADD_CHARSET(my_charset_bin);
#ifdef HAVE_CHARSET_big5 #ifdef HAVE_CHARSET_big5
MY_ADD_CHARSET(&my_charset_big5); MY_ADD_CHARSET(&my_charset_big5);