Commit fd04e8b6 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1 

into mysql.com:/usr/home/bar/mysql-5.0


libmysql/libmysql.c:
  Auto merged
parents 36405216 c72207e1

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -1509,7 +1509,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;

}