diff options
| author | unknown <georg@lmy002.wdf.sap.corp> | 2005-07-20 13:32:43 +0200 |
|---|---|---|
| committer | unknown <georg@lmy002.wdf.sap.corp> | 2005-07-20 13:32:43 +0200 |
| commit | 21038e65daf34d2348706775b6f45e91268969f8 (patch) | |
| tree | 78cd794abbe228ed3545ffb34546dc66bc667867 /include | |
| parent | 44589256c842d3694acebbc1284ef9f61806b1f7 (diff) | |
| parent | 6147be6eafb9dc896b2e2561ad9c523016af95c3 (diff) | |
| download | mariadb-git-21038e65daf34d2348706775b6f45e91268969f8.tar.gz | |
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index ab61fe694d9..0949937814c 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -381,7 +381,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); +int STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname); MYSQL * STDCALL mysql_init(MYSQL *mysql); my_bool STDCALL mysql_ssl_set(MYSQL *mysql, const char *key, |