bk commit into 5.0 tree (georg:1.1927)

[Georg Richter]

Below is the list of changes that have just been committed into a local
5.0 repository of georg. When georg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1927 05/07/14 09:50:24 georg@stripped +2 -0
  fixed function declaration and prototype for mysql_set_character_set

  libmysql/libmysql.c
    1.223 05/07/14 09:50:14 georg@stripped +1 -1
    fixed function declaration and prototype for mysql_set_character_set

  include/mysql.h
    1.154 05/07/14 09:50:14 georg@stripped +1 -1
    fixed function declaration and prototype for mysql_set_character_set

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.0

--- 1.153/include/mysql.h	2005-07-12 10:58:14 +02:00
+++ 1.154/include/mysql.h	2005-07-14 09:50:14 +02:00
@@ -396,7 +396,7 @@
 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,

--- 1.222/libmysql/libmysql.c	2005-07-12 10:58:14 +02:00
+++ 1.223/libmysql/libmysql.c	2005-07-14 09:50:14 +02:00
@@ -1511,7 +1511,7 @@
     csinfo->dir = charsets_dir;
 }
 
-int STDCALL mysql_set_character_set(MYSQL *mysql, char *cs_name)
+int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name)
 {
   struct charset_info_st *cs;
   const char *save_csdir= charsets_dir;