Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
This commit is contained in:
commit
d91cd61a4b
@ -1509,7 +1509,7 @@ ulong STDCALL mysql_thread_id(MYSQL *mysql)
|
|||||||
|
|
||||||
const char * STDCALL mysql_character_set_name(MYSQL *mysql)
|
const char * STDCALL mysql_character_set_name(MYSQL *mysql)
|
||||||
{
|
{
|
||||||
return mysql->charset->name;
|
return mysql->charset->csname;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user