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

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

Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
d91cd61a · bar@mysql.com · 05793bb9 · 308aec15 · d91cd61a
Commit d91cd61a authored Jan 17, 2005 by bar@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

libmysql/libmysql.c libmysql/libmysql.c +1 -1

No files found.
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -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;
 }