database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

MDEV-12579: Incorrect arguments to mysqld_stmt_execute when using LOBs

Browse Source 
Parameters can be MYSQL_TYPE_VARCHAR for long data load.
This commit is contained in:
Oleksandr Byelkin
2017-06-22 09:52:02 +02:00
parent 557e1bd472
commit 064d1a480c
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_prepare.cc
View File

@@ -825,8 +825,10 @@ static void setup_one_conversion_function(THD *thd, Item_param *param,
*/
inline bool is_param_long_data_type(Item_param *param)
{
return ((param->field_type() >= MYSQL_TYPE_TINY_BLOB) &&
(param->field_type() <= MYSQL_TYPE_STRING));
enum_field_types field_type= param->field_type();
return (((field_type >= MYSQL_TYPE_TINY_BLOB) &&
(field_type <= MYSQL_TYPE_STRING)) ||
field_type == MYSQL_TYPE_VARCHAR);
}

35
tests/mysql_client_test.c
View File

@@ -19531,6 +19531,40 @@ static void test_prepare_analyze()
check_execute(stmt, rc);
}
static void test_mdev12579()
{
MYSQL_STMT *stmt= mysql_stmt_init(mysql);
MYSQL_BIND bind[2];
int rc;
long l=3;
const char *data = "123456";
rc= mysql_query(mysql, "CREATE TABLE mdev12579 (k integer,t LONGTEXT,b LONGBLOB,x integer)");
myquery(rc);
rc= mysql_stmt_prepare(stmt, "INSERT INTO mdev12579 VALUES (1,?,NULL,?)", -1);
myquery(rc);
rc= mysql_stmt_send_long_data(stmt, 0, data, 6);
rc= mysql_stmt_send_long_data(stmt, 0, data, 6);
rc= mysql_stmt_send_long_data(stmt, 0, data, 6);
memset(bind, 0, sizeof(MYSQL_BIND) * 2);
bind[0].buffer_type= MYSQL_TYPE_VAR_STRING;
bind[1].buffer_type= MYSQL_TYPE_LONG;
bind[1].buffer= &l;
mysql_stmt_bind_param(stmt, bind);
rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc);
mysql_stmt_close(stmt);
rc= mysql_query(mysql, "DROP TABLE mdev12579");
myquery(rc);
}
static struct my_tests_st my_tests[]= {
{ "disable_query_logs", disable_query_logs },
{ "test_view_sp_list_fields", test_view_sp_list_fields },
@@ -19808,6 +19842,7 @@ static struct my_tests_st my_tests[]= {
{ "test_compressed_protocol", test_compressed_protocol },
{ "test_big_packet", test_big_packet },
{ "test_prepare_analyze", test_prepare_analyze },
{ "test_mdev12579", test_mdev12579 },
{ 0, 0 }
};