diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-03-25 16:12:49 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-03-25 16:12:49 +0400 |
| commit | 028822d27bcd59aa8ede44f11b31301b9eebac3c (patch) | |
| tree | 5c4421f5df2e84594b138fd023fa5e80746ef92a /mysys/charset.c | |
| parent | c8bdced21469ec1777abfea13662becc66944919 (diff) | |
| download | mariadb-git-028822d27bcd59aa8ede44f11b31301b9eebac3c.tar.gz | |
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
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 899acf46fac..30bd186c531 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -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; |