diff options
| author | unknown <timour@askmonty.org> | 2012-11-09 10:11:20 +0200 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2012-11-09 10:11:20 +0200 |
| commit | 3f590335363dec43e301fac174f9349233f5804c (patch) | |
| tree | 4c3b3e4f9f71cf31cc18cf7d0ba48a3ef3b5c2d3 /sql/sql_prepare.cc | |
| parent | 94cae65774194f8769b18e6943713d1fed5f89fa (diff) | |
| parent | 8df490044cf6fd4a7bcb38cab509975b39b1216d (diff) | |
| download | mariadb-git-3f590335363dec43e301fac174f9349233f5804c.tar.gz | |
Merge MariaDB 5.1.66 -> 5.2 -> 5.3
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 52584ef3d18..9e8a6b941c6 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -788,6 +788,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); + } } } /* |