libmysql.c:

  bug#7891: mysql_character_set_name() returns collation


libmysql/libmysql.c:
  bug#7891: mysql_character_set_name() returns collation

libmysql/libmysql.c

@@ -1504,7 +1504,7 @@ ulong STDCALL mysql_thread_id(MYSQL *mysql)
 
 const char * STDCALL mysql_character_set_name(MYSQL *mysql)
 {
-  return mysql->charset->name;
+  return mysql->charset->csname;
 }