← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

trunk merge plus more pbms updates for drizzle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
17
17
#include <drizzled/error.h>
18
18
#include <drizzled/table.h>
19
19
#include <drizzled/session.h>
20
 
#include <drizzled/current_session.h>
21
20
#include <drizzled/field/timestamp.h>
22
21
#include <drizzled/field/varstring.h>
23
22
#include "drizzled/plugin/daemon.h"
199
198
    HP_SHARE *internal_share= NULL;
200
199
    message::Table create_proto;
201
200
 
202
 
    if (!heap_storage_engine->heap_create_table(ha_session(), name, table,
 
201
    if (!heap_storage_engine->heap_create_table(table->in_use, name, table,
203
202
                                                internal_table,
204
203
                                                create_proto,
205
204
                                                &internal_share))
348
347
{
349
348
  int res;
350
349
  ha_statistic_increment(&system_status_var::ha_update_count);
351
 
  if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
352
 
    table->timestamp_field->set_time();
353
350
  res= heap_update(file,old_data,new_data);
354
351
  if (!res && ++records_changed*MEMORY_STATS_UPDATE_THRESHOLD >
355
352
              file->s->records)
735
732
 
736
733
  for (column_idx= 0; column_idx < column_count; column_idx++)
737
734
  {
738
 
    Field* field= *(table_arg->field + column_idx);
 
735
    Field* field= *(table_arg->getFields() + column_idx);
739
736
    HP_COLUMNDEF* column= columndef + column_idx;
740
737
    column->type= (uint16_t)field->type();
741
738
    column->length= field->pack_length();