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

Post-merge fixes.

Browse Source
This commit is contained in:
konstantin@mysql.com 2005-07-14 01:19:52 +04:00
parent 7b507e8bb0
commit e0b9e35484
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/mysql_client_test.c
View File

@ -13616,7 +13616,6 @@ static void test_bug11656()
static void test_bug10214() static void test_bug10214()
{ {
MYSQL_RES* res ;
int len; int len;
char out[8]; char out[8];
@ -13639,18 +13638,21 @@ static void test_bug10214()
static void test_client_character_set() static void test_client_character_set()
{ {
MY_CHARSET_INFO cs; MY_CHARSET_INFO cs;
const char *csname; char *csname;
int rc; int rc;
myheader("test_client_character_set"); myheader("test_client_character_set");
csname = "utf8"; csname= (char*) "utf8";
rc = mysql_set_character_set(mysql, csname); rc= mysql_set_character_set(mysql, csname);
DIE_UNLESS(rc == 0); DIE_UNLESS(rc == 0);
mysql_get_character_set_info(mysql, &cs); mysql_get_character_set_info(mysql, &cs);
DIE_UNLESS(!strcmp(cs.csname, "utf8")); DIE_UNLESS(!strcmp(cs.csname, "utf8"));
DIE_UNLESS(!strcmp(cs.name, "utf8_general_ci")); DIE_UNLESS(!strcmp(cs.name, "utf8_general_ci"));
/* Restore the default character set */
rc= mysql_query(mysql, "set names default");
myquery(rc);
} }