diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-05-20 12:36:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-05-20 12:36:30 +0200 |
| commit | d7a6c801ac6890fd8a218484db5293afdcc2808a (patch) | |
| tree | d399d63510cafdb2bb11ac083ae285aaebbb9096 /sql/sql_prepare.cc | |
| parent | db7085dfae07e8cf4e98e41bd0dc111fb1b4896b (diff) | |
| parent | 639a766096733861ce5f4ed4863d9db37090a4f4 (diff) | |
| download | mariadb-git-d7a6c801ac6890fd8a218484db5293afdcc2808a.tar.gz | |
5.3 merge.
change maria.distinct to use a function that doesn't require ssl-enabled builds
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 4d1ae0b79b2..dfaab2a2f92 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -879,7 +879,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 && param->item_type != Item::INT_ITEM) + if (param->limit_clause_param) { param->set_int(param->val_int(), MY_INT64_NUM_DECIMAL_DIGITS); param->item_type= Item::INT_ITEM; |