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

CONC-565: Incorrect max_length in binary protocol

Browse Source 
Fixed max_length values in ma_stmt_codecs for integer types:
- all types included an extra byte for trailing zero character
- maximum value for year column type is 2155 (and not 0xFFFF).
This commit is contained in:
Georg Richter
2021-07-26 17:47:37 +02:00
parent 490100ccac
commit 9c651bd678
2 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
unittest/libmariadb/ps.c
View File

@@ -5118,7 +5118,59 @@ static int test_conc349(MYSQL *mysql)
return OK;
}
static int test_conc565(MYSQL *mysql)
{
MYSQL_STMT *stmt= mysql_stmt_init(mysql);
MYSQL_FIELD *fields_binary, *fields_text;
MYSQL_RES *result;
int rc;
my_bool x=1;
my_bool error= 0;
rc= mysql_query(mysql, "CREATE TEMPORARY TABLE t1 (a year, b tinyint unsigned, c smallint unsigned, d mediumint unsigned, e int unsigned, f bigint unsigned)");
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "INSERT INTO t1 VALUES (2020, 127, 0xFFFF, 0xFFFFFF, 0xFFFFFFFF, 0xFFFFFFFFFFFFFFFF)");
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, "select a,b,c,d,e,f from t1", -1);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (void *)&x);
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
mysql_stmt_store_result(stmt);
fields_binary= mariadb_stmt_fetch_fields(stmt);
rc= mysql_query(mysql, "SELECT a,b,c,d,e,f FROM t1");
result= mysql_store_result(mysql);
fields_text= mysql_fetch_fields(result);
for (unsigned int i=0; i < mysql_field_count(mysql); i++)
{
if (fields_binary[i].length != fields_text[i].length ||
fields_binary[i].max_length != fields_text[i].max_length)
{
diag("Sizes differ for column %d (type= %d)", i, fields_binary[i].type);
diag("Binary (length=%ld max_length=%ld) != Text(length=%ld max_length=%ld",
fields_binary[i].length, fields_binary[i].max_length,
fields_text[i].length, fields_text[i].max_length);
error= 1;
goto end;
}
}
end:
mysql_free_result(result);
mysql_stmt_close(stmt);
return error ? FAIL : OK;
}
struct my_tests_st my_tests[] = {
{"test_conc565", test_conc565, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc349", test_conc349, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_prepare_error", test_prepare_error, TEST_CONNECTION_NEW, 0, NULL, NULL},
{"test_reexecute", test_reexecute, TEST_CONNECTION_NEW, 0, NULL, NULL},