mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Fix for bug #41078: With CURSOR_TYPE_READ_ONLY mysql_stmt_fetch()
returns short string value. Multibyte character sets were not taken into account when calculating max_length in Item_param::convert_str_value(). As a result, string parameters of a prepared statement could be truncated later when calculating string length in characters by dividing length in bytes by the charset's mbmaxlen value (e.g. in Field_varstring::store()). Fixed by taking charset's mbmaxlen into account when calculating max_length in Item_param::convert_str_value().
This commit is contained in:
@ -16410,6 +16410,69 @@ static void test_bug36326()
|
||||
|
||||
#endif
|
||||
|
||||
/**
|
||||
Bug#41078: With CURSOR_TYPE_READ_ONLY mysql_stmt_fetch() returns short
|
||||
string value.
|
||||
*/
|
||||
|
||||
static void test_bug41078(void)
|
||||
{
|
||||
uint rc;
|
||||
MYSQL_STMT *stmt= 0;
|
||||
MYSQL_BIND param, result;
|
||||
ulong cursor_type= CURSOR_TYPE_READ_ONLY;
|
||||
ulong len;
|
||||
char str[64];
|
||||
const char param_str[]= "abcdefghijklmn";
|
||||
my_bool is_null, error;
|
||||
|
||||
DBUG_ENTER("test_bug41078");
|
||||
|
||||
rc= mysql_query(mysql, "SET NAMES UTF8");
|
||||
myquery(rc);
|
||||
|
||||
stmt= mysql_simple_prepare(mysql, "SELECT ?");
|
||||
check_stmt(stmt);
|
||||
verify_param_count(stmt, 1);
|
||||
|
||||
rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, &cursor_type);
|
||||
check_execute(stmt, rc);
|
||||
|
||||
bzero(¶m, sizeof(param));
|
||||
param.buffer_type= MYSQL_TYPE_STRING;
|
||||
param.buffer= (void *) param_str;
|
||||
len= sizeof(param_str) - 1;
|
||||
param.length= &len;
|
||||
|
||||
rc= mysql_stmt_bind_param(stmt, ¶m);
|
||||
check_execute(stmt, rc);
|
||||
|
||||
rc= mysql_stmt_execute(stmt);
|
||||
check_execute(stmt, rc);
|
||||
|
||||
bzero(&result, sizeof(result));
|
||||
result.buffer_type= MYSQL_TYPE_STRING;
|
||||
result.buffer= str;
|
||||
result.buffer_length= sizeof(str);
|
||||
result.is_null= &is_null;
|
||||
result.length= &len;
|
||||
result.error= &error;
|
||||
|
||||
rc= mysql_stmt_bind_result(stmt, &result);
|
||||
check_execute(stmt, rc);
|
||||
|
||||
rc= mysql_stmt_store_result(stmt);
|
||||
check_execute(stmt, rc);
|
||||
|
||||
rc= mysql_stmt_fetch(stmt);
|
||||
check_execute(stmt, rc);
|
||||
|
||||
DIE_UNLESS(len == sizeof(param_str) - 1 && !strcmp(str, param_str));
|
||||
|
||||
mysql_stmt_close(stmt);
|
||||
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
/*
|
||||
Read and parse arguments and MySQL options from my.cnf
|
||||
@ -16713,6 +16776,7 @@ static struct my_tests_st my_tests[]= {
|
||||
#ifdef HAVE_QUERY_CACHE
|
||||
{ "test_bug36326", test_bug36326 },
|
||||
#endif
|
||||
{ "test_bug41078", test_bug41078 },
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user