← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2008-10-08 02:28:58 UTC
  • mfrom: (489.1.13 codestyle)
  • Revision ID: brian@tangent.org-20081008022858-ea8esagkxmn0dupc
Merge of Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1975
1975
                   create_info->default_table_charset->number : 0);
1976
1976
    fileinfo[39]= (unsigned char) create_info->page_checksum;
1977
1977
    fileinfo[40]= (unsigned char) create_info->row_type;
1978
 
    /* Next few bytes where for RAID support */
 
1978
    /* Next few bytes were for RAID support */
1979
1979
    fileinfo[41]= 0;
1980
1980
    fileinfo[42]= 0;
1981
1981
    int4store(fileinfo+43,create_info->block_size);
4513
4513
  const char *save_proc_info;
4514
4514
 
4515
4515
  save_proc_info=thd->get_proc_info();
4516
 
  thd_proc_info(thd, "removing tmp table");
 
4516
  thd->set_proc_info("removing tmp table");
4517
4517
 
4518
4518
  if (file)
4519
4519
  {
4535
4535
  plugin_unlock(0, s->db_plugin);
4536
4536
 
4537
4537
  free_root(&own_root, MYF(0)); /* the table is allocated in its own root */
4538
 
  thd_proc_info(thd, save_proc_info);
 
4538
  thd->set_proc_info(save_proc_info);
4539
4539
 
4540
4540
  return;
4541
4541
}
4570
4570
    return(1);                          // End of memory
4571
4571
 
4572
4572
  save_proc_info=thd->get_proc_info();
4573
 
  thd_proc_info(thd, "converting HEAP to MyISAM");
 
4573
  thd->set_proc_info("converting HEAP to MyISAM");
4574
4574
 
4575
4575
  if (new_table.create_myisam_tmp_table(table->key_info, start_recinfo,
4576
4576
                                        recinfo, thd->lex->select_lex.options | 
4637
4637
    const char *new_proc_info=
4638
4638
      (!strcmp(save_proc_info,"Copying to tmp table") ?
4639
4639
      "Copying to tmp table on disk" : save_proc_info);
4640
 
    thd_proc_info(thd, new_proc_info);
 
4640
    thd->set_proc_info(new_proc_info);
4641
4641
  }
4642
4642
  return(0);
4643
4643
 
4649
4649
  new_table.file->ha_delete_table(new_table.s->table_name.str);
4650
4650
 err2:
4651
4651
  delete new_table.file;
4652
 
  thd_proc_info(thd, save_proc_info);
 
4652
  thd->set_proc_info(save_proc_info);
4653
4653
  table->mem_root= new_table.mem_root;
4654
4654
  return(1);
4655
4655
}