1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changes after Bar's review: renamed CHARACTER_SET to MY_CHARSET_INFO

Browse Source
This commit is contained in:
georg@lmy002.wdf.sap.corp 2005-07-12 10:58:21 +02:00
parent ceba4ee9cd
commit 55d413252f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/mysql.h
View File

@ -228,7 +228,7 @@ typedef struct character_set
const char *dir; /* character set directory */ const char *dir; /* character set directory */
unsigned int mbminlen; /* min. length for multibyte strings */ unsigned int mbminlen; /* min. length for multibyte strings */
unsigned int mbmaxlen; /* max. length for multibyte strings */ unsigned int mbmaxlen; /* max. length for multibyte strings */
} CHARACTER_SET; } MY_CHARSET_INFO;
struct st_mysql_methods; 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, my_bool STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q,
unsigned long length); unsigned long length);
void STDCALL mysql_get_character_set_info(MYSQL *mysql, void STDCALL mysql_get_character_set_info(MYSQL *mysql,
CHARACTER_SET *charset); MY_CHARSET_INFO *charset);
/* local infile support */ /* local infile support */

2
libmysql/libmysql.c
View File

@ -1495,7 +1495,7 @@ const char * STDCALL mysql_character_set_name(MYSQL *mysql)
return mysql->charset->csname; 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->number = mysql->charset->number;
csinfo->state = mysql->charset->state; csinfo->state = mysql->charset->state;

2
tests/mysql_client_test.c
View File

@ -13628,7 +13628,7 @@ static void test_bug10214()
static void test_client_character_set() static void test_client_character_set()
{ {
CHARACTER_SET cs; MY_CHARSET_INFO cs;
const char *csname; const char *csname;
int rc; int rc;