mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
SHOW CHARACTER SET now can display comments
Low case letters are used in charset names BitKeeper/deleted/.del-MacRoman.xml~f890bce37d31d382: Delete: sql/share/charsets/MacRoman.xml BitKeeper/deleted/.del-MacCE.xml~fca413f3126f6189: Delete: sql/share/charsets/MacCE.xml mysys/charset.c: SHOW CHARACTER SET now can display comments sql/share/charsets/Index.xml: SHOW CHARACTER SET now can display comments sql/sql_show.cc: SHOW CHARACTER SET now can display comments strings/ctype.c: SHOW CHARACTER SET now can display comments
This commit is contained in:
@ -271,6 +271,9 @@ static void simple_cs_copy_data(CHARSET_INFO *to, CHARSET_INFO *from)
|
||||
if (from->name)
|
||||
to->name= my_once_strdup(from->name,MYF(MY_WME));
|
||||
|
||||
if (from->comment)
|
||||
to->comment= my_once_strdup(from->comment,MYF(MY_WME));
|
||||
|
||||
if (from->ctype)
|
||||
{
|
||||
to->ctype= (uchar*) my_once_memdup((char*) from->ctype,
|
||||
@ -339,7 +342,10 @@ static int add_collation(CHARSET_INFO *cs)
|
||||
}
|
||||
else
|
||||
{
|
||||
all_charsets[cs->number]->state |= cs->state;
|
||||
CHARSET_INFO *dst= all_charsets[cs->number];
|
||||
dst->state |= cs->state;
|
||||
if (cs->comment)
|
||||
dst->comment= my_once_strdup(cs->comment,MYF(MY_WME));
|
||||
}
|
||||
cs->number= 0;
|
||||
cs->primary_number= 0;
|
||||
|
Reference in New Issue
Block a user