← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/stored_key.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/stored_key.h
20
20
#ifndef DRIZZLED_STORED_KEY_H
21
21
#define DRIZZLED_STORED_KEY_H
22
22
 
23
 
namespace drizzled
24
 
{
25
 
 
26
23
/** class to store an field/item as a key struct */
27
 
class StoredKey :public memory::SqlAlloc
 
24
class StoredKey :public Sql_alloc
28
25
{
29
26
public:
30
27
  bool null_key; /**< If true, the value of the key has a null part */
62
59
                                    null,
63
60
                                    1,
64
61
                                    field_arg->field_name,
 
62
                                    field_arg->table->s,
65
63
                                    field_arg->charset());
66
 
      to_field->init(field_arg->getTable());
 
64
      to_field->init(field_arg->table);
67
65
    }
68
66
    else
69
 
      to_field= field_arg->new_key_field(session->mem_root, field_arg->getTable(),
 
67
      to_field= field_arg->new_key_field(session->mem_root, field_arg->table,
70
68
                                        ptr, null, 1);
71
69
 
72
70
    to_field->setWriteSet();
83
81
  enum store_key_result copy()
84
82
  {
85
83
    enum store_key_result result;
86
 
    Session *session= to_field->getTable()->in_use;
 
84
    Session *session= to_field->table->in_use;
87
85
    enum_check_fields saved_count_cuted_fields= session->count_cuted_fields;
88
86
    session->count_cuted_fields= CHECK_FIELD_IGNORE;
89
87
    result= copy_inner();
175
173
  }
176
174
};
177
175
 
178
 
} /* namespace drizzled */
179
 
 
180
176
#endif /* DRIZZLED_STORED_KEY_H */