database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +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

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);