diff options
| -rw-r--r-- | include/mysql.h | 4 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 | ||||
| -rw-r--r-- | tests/mysql_client_test.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/mysql.h b/include/mysql.h index 48602e27df5..daa29f70e16 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -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 */ diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index d387b48eff6..2074abd0f85 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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; diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 121e7fa1968..b237387ef35 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -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; |