Commit 74e43e8c authored by unknown's avatar unknown
Browse files

changes after Bar's review: renamed CHARACTER_SET to MY_CHARSET_INFO

parent c5e573da

include/mysql.h

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ typedef struct character_set 
  const char        *dir;       /* character set directory           */

  unsigned int      mbminlen;   /* min. length for multibyte strings */

  unsigned int      mbmaxlen;   /* max. length for multibyte strings */

} CHARACTER_SET;

} MY_CHARSET_INFO;



struct st_mysql_methods;
@@ -431,7 +431,7 @@ my_bool STDCALL mysql_slave_query(MYSQL *mysql, const char *q, 
my_bool		STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q,

					       unsigned long length);

void        STDCALL mysql_get_character_set_info(MYSQL *mysql,

                           CHARACTER_SET *charset);

                           MY_CHARSET_INFO *charset);



/* local infile support */

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ 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)

void STDCALL mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *csinfo)

{

  csinfo->number   = mysql->charset->number;

  csinfo->state    = mysql->charset->state;

tests/mysql_client_test.c

+1 −1
Original line number Diff line number Diff line
@@ -13628,7 +13628,7 @@ static void test_bug10214() 


static void test_client_character_set()

{

  CHARACTER_SET	cs;

  MY_CHARSET_INFO cs;

  const char *csname;

  int rc;