← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

trunk merge plus more pbms updates for drizzle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
296
296
    minpos= share->getRecordLength();
297
297
    length= 0;
298
298
 
299
 
    for (field= table_arg->field; *field; field++)
 
299
    for (field= table_arg->getFields(); *field; field++)
300
300
    {
301
301
      if ((fieldpos= (*field)->offset(record)) >= recpos &&
302
302
          fieldpos <= minpos)
903
903
  }
904
904
  else if (mode == HA_KEY_SWITCH_NONUNIQ_SAVE)
905
905
  {
906
 
    Session *session=current_session;
 
906
    Session *session= table->in_use;
907
907
    MI_CHECK param;
908
908
    const char *save_proc_info= session->get_proc_info();
909
909
    session->set_proc_info("Creating index");
979
979
 
980
980
void ha_myisam::start_bulk_insert(ha_rows rows)
981
981
{
982
 
  Session *session= current_session;
 
982
  Session *session= table->in_use;
983
983
  ulong size= session->variables.read_buff_size;
984
984
 
985
985
  /* don't enable row cache if too few rows */
1034
1034
int ha_myisam::doUpdateRecord(const unsigned char *old_data, unsigned char *new_data)
1035
1035
{
1036
1036
  ha_statistic_increment(&system_status_var::ha_update_count);
1037
 
  if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
1038
 
    table->timestamp_field->set_time();
1039
1037
  return mi_update(file,old_data,new_data);
1040
1038
}
1041
1039