diff options
| author | konstantin@mysql.com <> | 2005-05-14 12:38:12 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2005-05-14 12:38:12 +0400 |
| commit | 89bd09fed2565f0e509a9d81ca7e9782ff1f8ea1 (patch) | |
| tree | 301d852032306dc5560a6076b889c4d7c3d6da7d /include/mysql.h | |
| parent | 3ff39b3704b4b0023ab107217ec36fe578f26e4d (diff) | |
| parent | 6c981c0b8005a1577c7dfd93eb656a5da46ef9f0 (diff) | |
| download | mariadb-git-89bd09fed2565f0e509a9d81ca7e9782ff1f8ea1.tar.gz | |
Manual merge (again)
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h index 24f1961a260..bcff8fa8645 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -384,6 +384,7 @@ unsigned int STDCALL mysql_warning_count(MYSQL *mysql); const char * STDCALL mysql_info(MYSQL *mysql); unsigned long STDCALL mysql_thread_id(MYSQL *mysql); const char * STDCALL mysql_character_set_name(MYSQL *mysql); +int STDCALL mysql_set_character_set(MYSQL *mysql, char *csname); MYSQL * STDCALL mysql_init(MYSQL *mysql); my_bool STDCALL mysql_ssl_set(MYSQL *mysql, const char *key, |