← 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: 2009-01-17 00:52:59 UTC
  • Revision ID: brian@gir-3.local-20090117005259-goyecyq0tpi9irnb
Pass through on refactoring functions to clases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1827
1827
  return (error);
1828
1828
}
1829
1829
 
 
1830
/* close_temporary_tables' internal, 4 is due to uint4korr definition */
 
1831
uint32_t  Table::tmpkeyval()
 
1832
{
 
1833
  return uint4korr(s->table_cache_key.str + s->table_cache_key.length - 4);
 
1834
}
1830
1835
 
1831
1836
/*
1832
1837
  Free information allocated by openfrm
1837
1842
    free_share          Is 1 if we also want to free table_share
1838
1843
*/
1839
1844
 
1840
 
int closefrm(register Table *table, bool free_share)
 
1845
int Table::closefrm(bool free_share)
1841
1846
{
1842
1847
  int error=0;
1843
1848
 
1844
 
  if (table->db_stat)
1845
 
    error=table->file->close();
1846
 
  free((char*) table->alias);
1847
 
  table->alias= 0;
1848
 
  if (table->field)
 
1849
  if (db_stat)
 
1850
    error= file->close();
 
1851
  free((char*) alias);
 
1852
  alias= NULL;
 
1853
  if (field)
1849
1854
  {
1850
 
    for (Field **ptr=table->field ; *ptr ; ptr++)
 
1855
    for (Field **ptr=field ; *ptr ; ptr++)
1851
1856
      delete *ptr;
1852
 
    table->field= 0;
 
1857
    field= 0;
1853
1858
  }
1854
 
  delete table->file;
1855
 
  table->file= 0;                               /* For easier errorchecking */
 
1859
  delete file;
 
1860
  file= 0;                              /* For easier errorchecking */
1856
1861
  if (free_share)
1857
1862
  {
1858
 
    if (table->s->tmp_table == NO_TMP_TABLE)
1859
 
      release_table_share(table->s, RELEASE_NORMAL);
 
1863
    if (s->tmp_table == NO_TMP_TABLE)
 
1864
      release_table_share(s, RELEASE_NORMAL);
1860
1865
    else
1861
 
      free_table_share(table->s);
 
1866
      free_table_share(s);
1862
1867
  }
1863
 
  free_root(&table->mem_root, MYF(0));
1864
 
  return(error);
 
1868
  free_root(&mem_root, MYF(0));
 
1869
 
 
1870
  return error;
1865
1871
}
1866
1872
 
1867
1873