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

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


libmysql/libmysql.c:
  Auto merged
This commit is contained in:
unknown 2005-01-17 09:30:30 +04:00
commit fd04e8b660

View file

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