Commit b637e10d authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents dc8d71d3 337dee0e

mysys/charset.c

+4 −3
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static uint num_from_csname(CS_ID **cs, const char *name) 
static char *name_from_csnum(CS_ID **cs, uint number)

{

  CS_ID **c;

  if(cs)

    for (c = cs; *c; ++c)

      if ((*c)->number == number)

	return (*c)->name;