summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2013-04-09 09:58:51 +0300
committerunknown <sanja@askmonty.org>2013-04-09 09:58:51 +0300
commit80c0891588dd8aef2a0e08864b00067ffd9de5ce (patch)
tree79b6a72517e41e6b7c0257ecbb3c8d7faa4969d5 /sql/sql_prepare.cc
parent7b55b59b5792d87dedd946487769bc2b1dc36833 (diff)
downloadmariadb-git-80c0891588dd8aef2a0e08864b00067ffd9de5ce.tar.gz
MDEV-4326 fix.
Removed "optimization" which caused preoblems on second execution of PS with string parameter in LIMIT clause. Fixed test_bug43560 to be able to skipp it if connection is UNIX socket.
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r--sql/sql_prepare.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 0c1c33dcee0..733fc00bf20 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -787,7 +787,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;