Merge work:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql

mysys/charset.c

@@ -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;