Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
This commit is contained in:
commit
36bf1e7195
@ -333,17 +333,11 @@ class Item_field :public Item_ident
|
|||||||
void set_field(Field *field);
|
void set_field(Field *field);
|
||||||
public:
|
public:
|
||||||
Field *field,*result_field;
|
Field *field,*result_field;
|
||||||
#ifndef DBUG_OFF
|
|
||||||
bool double_fix;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Item_field(const char *db_par,const char *table_name_par,
|
Item_field(const char *db_par,const char *table_name_par,
|
||||||
const char *field_name_par)
|
const char *field_name_par)
|
||||||
:Item_ident(db_par,table_name_par,field_name_par),
|
:Item_ident(db_par,table_name_par,field_name_par),
|
||||||
field(0), result_field(0)
|
field(0), result_field(0)
|
||||||
#ifndef DBUG_OFF
|
|
||||||
,double_fix(0)
|
|
||||||
#endif
|
|
||||||
{ collation.set(DERIVATION_IMPLICIT); }
|
{ collation.set(DERIVATION_IMPLICIT); }
|
||||||
// Constructor need to process subselect with temporary tables (see Item)
|
// Constructor need to process subselect with temporary tables (see Item)
|
||||||
Item_field(THD *thd, Item_field *item);
|
Item_field(THD *thd, Item_field *item);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user