summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
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 09:52:02 +0200
commit1d90a8304bf0983a91044ca451129552388b026d (patch)
tree0a08e0204c733cc3ea4964a367395140b2d7bada /sql/sql_prepare.cc
parent0992be927e1c686c39c39fe53fc2a7869d55143d (diff)
downloadmariadb-git-bb-10.2-MDEV-12579.tar.gz
MDEV-12579: Incorrect arguments to mysqld_stmt_execute when using LOBsbb-10.2-MDEV-12579
Parameters can be MYSQL_TYPE_VARCHAR for long data load.
Diffstat (limited to 'sql/sql_prepare.cc')
-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);
}