← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/csv/ha_tina.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/csv/ha_tina.cc
124
124
    tina_open_tables()
125
125
  {}
126
126
  virtual Cursor *create(TableShare &table,
127
 
                          MEM_ROOT *mem_root)
 
127
                         drizzled::memory::Root *mem_root)
128
128
  {
129
129
    return new (mem_root) ha_tina(*this, table);
130
130
  }
695
695
  int eoln_len;
696
696
  int error;
697
697
 
698
 
  free_root(&blobroot, MYF(MY_MARK_BLOCKS_FREE));
 
698
  free_root(&blobroot, MYF(drizzled::memory::MARK_BLOCKS_FREE));
699
699
 
700
700
  /*
701
701
    We do not read further then local_saved_data_file_length in order
1118
1118
  records_is_known= 0;
1119
1119
  chain_ptr= chain;
1120
1120
 
1121
 
  init_alloc_root(&blobroot, BLOB_MEMROOT_ALLOC_SIZE, 0);
 
1121
  init_alloc_root(&blobroot, BLOB_MEMROOT_ALLOC_SIZE);
1122
1122
 
1123
1123
  return(0);
1124
1124
}