diff options
| author | unknown <georg@lmy002.wdf.sap.corp> | 2005-07-12 10:31:43 +0200 |
|---|---|---|
| committer | unknown <georg@lmy002.wdf.sap.corp> | 2005-07-12 10:31:43 +0200 |
| commit | c5e573dabcbeac370173c0a181a07f8cbef4310a (patch) | |
| tree | 65aac3a57e0177c50cf47b7c33c57682fd1368f3 /libmysql | |
| parent | de1254ad792fe54b033ba106979db9854de2f976 (diff) | |
| download | mariadb-git-c5e573dabcbeac370173c0a181a07f8cbef4310a.tar.gz | |
New attempt after Bar's review
Added api function mysql_get_character_set_info which provides
information about the current client character set.
include/mysql.h:
Added api function mysql_get_character_set_info which provides
information about the current client character set.
libmysql/libmysql.c:
Added api function mysql_get_character_set_info which provides
information about the current client character set.
libmysql/libmysql.def:
Added api function mysql_get_character_set_info which provides
information about the current client character set.
tests/mysql_client_test.c:
Added api function mysql_get_character_set_info which provides
information about the current client character set.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 15 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 2a4bc5151c1..d387b48eff6 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1495,6 +1495,21 @@ const char * STDCALL mysql_character_set_name(MYSQL *mysql) return mysql->charset->csname; } +void STDCALL mysql_get_character_set_info(MYSQL *mysql, CHARACTER_SET *csinfo) +{ + csinfo->number = mysql->charset->number; + csinfo->state = mysql->charset->state; + csinfo->csname = mysql->charset->csname; + csinfo->name = mysql->charset->name; + csinfo->comment = mysql->charset->comment; + csinfo->mbminlen = mysql->charset->mbminlen; + csinfo->mbmaxlen = mysql->charset->mbmaxlen; + + if (mysql->options.charset_dir) + csinfo->dir = mysql->options.charset_dir; + else + csinfo->dir = charsets_dir; +} int STDCALL mysql_set_character_set(MYSQL *mysql, char *cs_name) { diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index 2da88c271ba..0688ea5732b 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -149,5 +149,6 @@ EXPORTS mysql_server_init mysql_server_end mysql_set_character_set + mysql_get_character_set_info get_defaults_files modify_defaults_file |