diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-03-15 14:16:57 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-03-15 14:16:57 +0200 |
| commit | 9e7b3cde60e5d16b0dab75caed5b502f60191314 (patch) | |
| tree | d2d9f7472307e59e72df71efdbbfee659a56c4a0 /sql/sql_select.cc | |
| parent | 83814ef4290b939872e3661de85643cae20758a8 (diff) | |
| parent | ced5e414b6770841e6d1b2299a855e90285d455f (diff) | |
| download | mariadb-git-9e7b3cde60e5d16b0dab75caed5b502f60191314.tar.gz | |
Merge
sql/item_subselect.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/subselect.result:
SCCS merged
mysql-test/t/subselect.test:
SCCS merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 14 |
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, |