diff options
| author | unknown <timour@askmonty.org> | 2012-11-06 11:52:55 +0200 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2012-11-06 11:52:55 +0200 |
| commit | 7c23d6d0c66cb3b84cb466f956e19bfea0acc342 (patch) | |
| tree | 551dd23a43a26923a6dd30096a2822a27a90f355 /sql/sql_prepare.cc | |
| parent | 43293b7a515dbb2cf04907e2d98bcc813279cad8 (diff) | |
| parent | 813b661d00123e3291530d102e2b94388f42fb0f (diff) | |
| download | mariadb-git-7c23d6d0c66cb3b84cb466f956e19bfea0acc342.tar.gz | |
Merge MySQL 5.1.66 -> MariaDB 5.1.65
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 7f5cbc5e99b..0c1c33dcee0 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -786,6 +786,14 @@ static bool insert_params_with_log(Prepared_statement *stmt, uchar *null_array, param->set_param_func(param, &read_pos, (uint) (data_end - read_pos)); if (param->state == Item_param::NO_VALUE) DBUG_RETURN(1); + + if (param->limit_clause_param && param->item_type != Item::INT_ITEM) + { + param->set_int(param->val_int(), MY_INT64_NUM_DECIMAL_DIGITS); + param->item_type= Item::INT_ITEM; + if (!param->unsigned_flag && param->value.integer < 0) + DBUG_RETURN(1); + } } } /* |