diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
| commit | 37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6 (patch) | |
| tree | 6bd2508d867303d8830aab0f246cd61a7ec5a835 /sql/sql_prepare.cc | |
| parent | e8f6f402922295ec36aab42976f3e494455407d4 (diff) | |
| parent | 5caddbfd5b4a7ec377f3d40a5830436e0e6e993b (diff) | |
| download | mariadb-git-37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6.tar.gz | |
MySQL-5.5.35 merge
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index ad1e291a9d7..e948813584d 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -880,7 +880,7 @@ static bool insert_params_with_log(Prepared_statement *stmt, uchar *null_array, if (param->state == Item_param::NO_VALUE) DBUG_RETURN(1); - if (param->limit_clause_param) + if (param->limit_clause_param && param->state != Item_param::INT_VALUE) { param->set_int(param->val_int(), MY_INT64_NUM_DECIMAL_DIGITS); param->item_type= Item::INT_ITEM; |