Merge work:/home/bk/mysql

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

1 files changed, 4 insertions, 3 deletions

diff --git a/mysys/charset.c b/mysys/charset.c
index 82e84715213..384b2c6e71a 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -63,9 +63,10 @@ static uint num_from_csname(CS_ID **cs, const char *name)
 static char *name_from_csnum(CS_ID **cs, uint number)
 {
   CS_ID **c;
-  for (c = cs; *c; ++c)
-    if ((*c)->number == number)
-      return (*c)->name;
+  if(cs)
+    for (c = cs; *c; ++c)
+      if ((*c)->number == number)
+	return (*c)->name;
   return "?";   /* this mimics find_type() */
 }