diff options
| author | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2012-07-26 23:53:45 +0530 |
|---|---|---|
| committer | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2012-07-26 23:53:45 +0530 |
| commit | 0c75ba44fee206ce90ec31faa0aaec8d0d609b6e (patch) | |
| tree | 83029a796049094a284c2ddcefeef09bfc80419a /sql/sql_prepare.cc | |
| parent | fe7a28e7596e4e46357bd009c5a910e1bdb8a40c (diff) | |
| parent | 44cd81da86e41c6ac7114ef8dbd31c738eba095d (diff) | |
| download | mariadb-git-0c75ba44fee206ce90ec31faa0aaec8d0d609b6e.tar.gz | |
Merge from 5.1 to 5.5
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 d0bfecebc82..2122a2badf9 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -875,6 +875,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); + } } } /* |