summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc14
1 files changed, 5 insertions, 9 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 4c022014b86..3e20f21f567 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2766,19 +2766,15 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j, KEYUSE *org_keyuse,
if (!keyuse->used_tables &&
!(join->select_options & SELECT_DESCRIBE))
{ // Compare against constant
- store_key_item *tmp=new store_key_item(thd,
- keyinfo->key_part[i].field,
- (char*)key_buff +
- maybe_null,
- maybe_null ?
- (char*) key_buff : 0,
- keyinfo->key_part[i].length,
- keyuse->val);
+ store_key_item tmp(thd, keyinfo->key_part[i].field,
+ (char*)key_buff + maybe_null,
+ maybe_null ? (char*) key_buff : 0,
+ keyinfo->key_part[i].length, keyuse->val);
if (thd->is_fatal_error)
{
return TRUE;
}
- tmp->copy();
+ tmp.copy();
}
else
*ref_key++= get_store_key(thd,