Merge work:/home/bk/mysql

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

Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
357167f2 · unknown · 9f50424d · 2ca5d837 · 357167f2
Commit 357167f2 authored Aug 30, 2000 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

mysys/charset.c mysys/charset.c +4 -3

No files found.
--- 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(cs)
-    if ((*c)->number == number)
+    for (c = cs; *c; ++c)
-      return (*c)->name;
+      if ((*c)->number == number)
+	return (*c)->name;
  return "?";   /* this mimics find_type() */
 }