diff options
| author | bar@mysql.com <> | 2005-01-17 09:30:30 +0400 |
|---|---|---|
| committer | bar@mysql.com <> | 2005-01-17 09:30:30 +0400 |
| commit | d91cd61a4b98d303be4816b2c4135d768e82d878 (patch) | |
| tree | 35e951dd01122fbbf64a25d7c6ced7e4f2784bc5 /libmysql | |
| parent | 05793bb9b92bd29fd1409c664b5da05955b45324 (diff) | |
| parent | 308aec15269d135ec3ca5ec9bdad7c558706478e (diff) | |
| download | mariadb-git-d91cd61a4b98d303be4816b2c4135d768e82d878.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 29c6f469098..2a2c496b914 100644 --- 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; } |