database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

more fixes for 10.2 integration

Browse Source
This commit is contained in:
Georg Richter
2016-02-02 20:09:42 +01:00
parent 4ecc4c0704
commit e138995b87
35 changed files with 192 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unittest/libmariadb/charset.c
View File

@@ -658,12 +658,12 @@ static int test_bug_54100(MYSQL *mysql)
/* We need this internal function for the test */
CHARSET_INFO * mysql_find_charset_name(const char *name);
MARIADB_CHARSET_INFO * mysql_find_charset_name(const char *name);
static int test_utf16_utf32_noboms(MYSQL *mysql)
{
char *csname[]= {"utf16", "utf16le", "utf32", "utf8"};
CHARSET_INFO *csinfo[sizeof(csname)/sizeof(char*)];
MARIADB_CHARSET_INFO *csinfo[sizeof(csname)/sizeof(char*)];
const int UTF8= sizeof(csname)/sizeof(char*) - 1;

6
unittest/libmariadb/dyncol.c
View File

@@ -39,7 +39,7 @@ static int create_dyncol_named(MYSQL *mysql)
vals[i].type= DYN_COL_STRING;
vals[i].x.string.value.str= strval[i];
vals[i].x.string.value.length= strlen(strval[i]);
vals[i].x.string.charset= (CHARSET_INFO *)mysql->charset;
vals[i].x.string.charset= (MARIADB_CHARSET_INFO *)mysql->charset;
diag("%s", keys3[i].str);
}
@@ -132,7 +132,7 @@ static int create_dyncol_num(MYSQL *mysql)
vals[i].type= DYN_COL_STRING;
vals[i].x.string.value.str= strval[i];
vals[i].x.string.value.length= strlen(strval[i]);
vals[i].x.string.charset= (CHARSET_INFO *)mysql->charset;
vals[i].x.string.charset= (MARIADB_CHARSET_INFO *)mysql->charset;
}
FAIL_IF(mariadb_dyncol_create_many_num(&dyncol, column_count, keys1, vals, 1) <0, "Error (keys1)");
@@ -176,7 +176,7 @@ static int mdev_x1(MYSQL *mysql)
vals[i].type= DYN_COL_STRING;
vals[i].x.string.value.str= strval[i];
vals[i].x.string.value.length= strlen(strval[i]);
vals[i].x.string.charset= (CHARSET_INFO *)mysql->charset;
vals[i].x.string.charset= (MARIADB_CHARSET_INFO *)mysql->charset;
}
mariadb_dyncol_init(&dynstr);

4
unittest/libmariadb/misc.c
View File

@@ -1030,7 +1030,7 @@ static int test_get_info(MYSQL *mysql)
char *cval;
int rc;
MY_CHARSET_INFO cs;
CHARSET_INFO *ci;
MARIADB_CHARSET_INFO *ci;
char **errors;
rc= mariadb_get_infov(mysql, MARIADB_MAX_ALLOWED_PACKET, &sval);
@@ -1045,7 +1045,7 @@ static int test_get_info(MYSQL *mysql)
rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_SERVER_VERSION_ID, &sval);
FAIL_IF(rc, "mysql_get_info failed");
diag("server_version_id: %d", sval);
rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_CHARSET_INFO, &cs);
rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_MARIADB_CHARSET_INFO, &cs);
FAIL_IF(rc, "mysql_get_info failed");
diag("charset name: %s", cs.csname);
rc= mariadb_get_infov(mysql, MARIADB_CONNECTION_PVIO_TYPE, &ival);

2
unittest/libmariadb/my_test.h
View File

@@ -165,7 +165,7 @@ int do_verify_prepare_field(MYSQL_RES *result,
const char *file, int line)
{
MYSQL_FIELD *field;
/* CHARSET_INFO *cs; */
/* MARIADB_CHARSET_INFO *cs; */
FAIL_IF(!(field= mysql_fetch_field_direct(result, no)), "FAILED to get result");
/* cs= mysql_find_charset_nr(field->charsetnr);