summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2017-06-22 09:52:02 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2017-06-22 15:28:57 +0200
commit064d1a480c6bb6825ecd00a765939a7715cd43c2 (patch)
treed9752b3a4a815614cf2726522846e0b8d957e233 /sql
parent557e1bd472612848a42e772c1fb6f8ed32ab33b4 (diff)
downloadmariadb-git-064d1a480c6bb6825ecd00a765939a7715cd43c2.tar.gz
MDEV-12579: Incorrect arguments to mysqld_stmt_execute when using LOBs
Parameters can be MYSQL_TYPE_VARCHAR for long data load.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_prepare.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 11274fbbaa2..92137b30f77 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -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);
}