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

sql_show.cc:

Browse Source 
Don't display charsets/collations with HIDDEN flag.
ctype-utf8.c:
  Adding HIDDEN flag to "filename"
  Changeing ID to 17 which was previosly
  used by deprecated "win1251", removed in 4.1.
charset-def.c:
  Adding "filename" as a hidden charset, for test purposes.
m_ctype.h:
  Adding MY_CS_HIDDEN flag,
  to hide charsets and collations from
  being displayed in SHOW.
This commit is contained in:
bar@mysql.com
2006-01-18 12:27:02 +04:00
parent 92e1557dce
commit 0e665a7aa5
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/m_ctype.h
View File

@ -66,7 +66,8 @@ extern MY_UNICASE_INFO *my_unicase_turkish[256];
#define MY_CS_UNICODE 128 /* is a charset is full unicode */ #define MY_CS_UNICODE 128 /* is a charset is full unicode */
#define MY_CS_READY 256 /* if a charset is initialized */ #define MY_CS_READY 256 /* if a charset is initialized */
#define MY_CS_AVAILABLE 512 /* If either compiled-in or loaded*/ #define MY_CS_AVAILABLE 512 /* If either compiled-in or loaded*/
#define MY_CS_CSSORT 1024 /* if case sensitive sort order */ #define MY_CS_CSSORT 1024 /* if case sensitive sort order */
#define MY_CS_HIDDEN 2048 /* don't display in SHOW */
#define MY_CHARSET_UNDEFINED 0 #define MY_CHARSET_UNDEFINED 0

1
mysys/charset-def.c
View File

@ -78,6 +78,7 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
CHARSET_INFO *cs; CHARSET_INFO *cs;
add_compiled_collation(&my_charset_bin); add_compiled_collation(&my_charset_bin);
add_compiled_collation(&my_charset_filename);
add_compiled_collation(&my_charset_latin1); add_compiled_collation(&my_charset_latin1);
add_compiled_collation(&my_charset_latin1_bin); add_compiled_collation(&my_charset_latin1_bin);

2
sql/sql_show.cc
View File

@ -2835,6 +2835,7 @@ int fill_schema_charsets(THD *thd, TABLE_LIST *tables, COND *cond)
CHARSET_INFO *tmp_cs= cs[0]; CHARSET_INFO *tmp_cs= cs[0];
if (tmp_cs && (tmp_cs->state & MY_CS_PRIMARY) && if (tmp_cs && (tmp_cs->state & MY_CS_PRIMARY) &&
(tmp_cs->state & MY_CS_AVAILABLE) && (tmp_cs->state & MY_CS_AVAILABLE) &&
!(tmp_cs->state & MY_CS_HIDDEN) &&
!(wild && wild[0] && !(wild && wild[0] &&
wild_case_compare(scs, tmp_cs->csname,wild))) wild_case_compare(scs, tmp_cs->csname,wild)))
{ {
@ -2904,6 +2905,7 @@ int fill_schema_collation(THD *thd, TABLE_LIST *tables, COND *cond)
CHARSET_INFO **cl; CHARSET_INFO **cl;
CHARSET_INFO *tmp_cs= cs[0]; CHARSET_INFO *tmp_cs= cs[0];
if (!tmp_cs || !(tmp_cs->state & MY_CS_AVAILABLE) || if (!tmp_cs || !(tmp_cs->state & MY_CS_AVAILABLE) ||
(tmp_cs->state & MY_CS_HIDDEN) ||
!(tmp_cs->state & MY_CS_PRIMARY)) !(tmp_cs->state & MY_CS_PRIMARY))
continue; continue;
for (cl= all_charsets; cl < all_charsets+255 ;cl ++) for (cl= all_charsets; cl < all_charsets+255 ;cl ++)

4
strings/ctype-utf8.c
View File

@ -4048,8 +4048,8 @@ static MY_CHARSET_HANDLER my_charset_filename_handler=
CHARSET_INFO my_charset_filename= CHARSET_INFO my_charset_filename=
{ {
33,0,0, /* number */ 17,0,0, /* number */
MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE, /* state */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_HIDDEN,
"filename", /* cs name */ "filename", /* cs name */
"filename", /* name */ "filename", /* name */
"", /* comment */ "", /* comment */