← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/stored_key.h

  • Committer: Monty Taylor
  • Date: 2010-06-02 22:35:45 UTC
  • mto: This revision was merged to the branch mainline in revision 1586.
  • Revision ID: mordred@inaugust.com-20100602223545-q8ekf9b40a85nwuf
Rearragned unittests into a single exe because of how we need to link it
(thanks lifeless)
Link with server symbols without needing to build a library.
Added an additional atomics test which tests whatever version of the atomics
lib the running platform would actually use.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/stored_key.h
62
62
                                    null,
63
63
                                    1,
64
64
                                    field_arg->field_name,
 
65
                                    field_arg->table->getMutableShare(),
65
66
                                    field_arg->charset());
66
 
      to_field->init(field_arg->getTable());
 
67
      to_field->init(field_arg->table);
67
68
    }
68
69
    else
69
 
      to_field= field_arg->new_key_field(session->mem_root, field_arg->getTable(),
 
70
      to_field= field_arg->new_key_field(session->mem_root, field_arg->table,
70
71
                                        ptr, null, 1);
71
72
 
72
73
    to_field->setWriteSet();
83
84
  enum store_key_result copy()
84
85
  {
85
86
    enum store_key_result result;
86
 
    Session *session= to_field->getTable()->in_use;
 
87
    Session *session= to_field->table->in_use;
87
88
    enum_check_fields saved_count_cuted_fields= session->count_cuted_fields;
88
89
    session->count_cuted_fields= CHECK_FIELD_IGNORE;
89
90
    result= copy_inner();