summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2004-01-19 19:53:25 +0400
committerunknown <hf@deer.(none)>2004-01-19 19:53:25 +0400
commitc8eff1773e1a0896ccba36da559bb5db3b8197c8 (patch)
tree6442c2ebc134789f4bed8f0e909b2928c8f04321 /sql/item.h
parent0052fb4d357f650cc60ef7b9b67c6d79b70a976d (diff)
downloadmariadb-git-c8eff1773e1a0896ccba36da559bb5db3b8197c8.tar.gz
Code cleanup (working on PS & cleanup() code)
Item & changed with Item* in Item_xxx constructors tables_list.first -> get_table_list() sql/item.cc: Item& -> Item* sql/item.h: Item& -> Item* sql/item_cmpfunc.cc: Item& -> Item* sql/item_cmpfunc.h: Item& -> Item* sql/item_func.cc: Item& -> Item* sql/item_func.h: Item& -> Item* sql/item_sum.cc: Item& -> Item* sql/item_sum.h: Item& -> Item* sql/item_uniq.h: Item& -> Item* sql/sql_prepare.cc: Code cleanup sql/sql_select.cc: Item& -> Item*
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/item.h b/sql/item.h
index e1318224498..dc3a9114601 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -124,7 +124,7 @@ public:
top AND/OR ctructure of WHERE clause to protect it of
optimisation changes in prepared statements
*/
- Item(THD *thd, Item &item);
+ Item(THD *thd, Item *item);
virtual ~Item() { name=0; cleanup(); } /*lint -e1509 */
void set_name(const char *str,uint length, CHARSET_INFO *cs);
void init_make_field(Send_field *tmp_field,enum enum_field_types type);
@@ -240,7 +240,7 @@ public:
st_select_lex *depended_from;
Item_ident(const char *db_name_par,const char *table_name_par,
const char *field_name_par);
- Item_ident::Item_ident(THD *thd, Item_ident &item);
+ Item_ident::Item_ident(THD *thd, Item_ident *item);
const char *full_name() const;
bool remove_dependence_processor(byte * arg);
@@ -259,7 +259,7 @@ public:
:Item_ident(db_par,table_name_par,field_name_par),field(0),result_field(0)
{ collation.set(DERIVATION_IMPLICIT); }
// Constructor need to process subselect with temporary tables (see Item)
- Item_field(THD *thd, Item_field &item);
+ Item_field(THD *thd, Item_field *item);
Item_field(Field *field);
enum Type type() const { return FIELD_ITEM; }
bool eq(const Item *item, bool binary_cmp) const;
@@ -581,8 +581,8 @@ public:
Field *result_field; /* Save result here */
Item_result_field() :result_field(0) {}
// Constructor used for Item_sum/Item_cond_and/or (see Item comment)
- Item_result_field(THD *thd, Item_result_field &item):
- Item(thd, item), result_field(item.result_field)
+ Item_result_field(THD *thd, Item_result_field *item):
+ Item(thd, item), result_field(item->result_field)
{}
~Item_result_field() {} /* Required with gcc 2.95 */
Field *get_tmp_table_field() { return result_field; }
@@ -614,8 +614,8 @@ public:
:Item_ident(NullS,table_name_par,field_name_par),
ref(item), hook_ptr(hook), orig_item(hook ? *hook:0) {}
// Constructor need to process subselect with temporary tables (see Item)
- Item_ref(THD *thd, Item_ref &item, Item **hook)
- :Item_ident(thd, item), ref(item.ref),
+ Item_ref(THD *thd, Item_ref *item, Item **hook)
+ :Item_ident(thd, item), ref(item->ref),
hook_ptr(hook), orig_item(hook ? *hook : 0) {}
enum Type type() const { return REF_ITEM; }
bool eq(const Item *item, bool binary_cmp) const